Consolidate unit name expressions and conversions.