Singularize units and simplify conversion