MMS phase 2, reduce the number of type conversions..