More work on unit conversion.