More NumericConversion cleanup.