extended expand_units() to allow units suffixed on first arg