fixup! fixup! Implementation of old-style keys as OpaqueKeys (Location and course_id)