Also adjust __quantity_instance__ in Angle, though incomplete pending #1310