Move away from column.sql_type in untested code too