Pass unit through Unit (fast if UnitBase already); use to simplify further