Move more course_id/location conversions over