Issue #997. More parameter value conversion to units.