All tests pass again!  Rewrote
_convert_physical_quantity_and_ac_type_to_cols().  Needs some tidying up.