unit: Simplify previous commit