New bus and train flags instead of vehicle_type_fk.