improve legacy units to be more consistent (particularly for multiplicaton). Fixes #2276