fixup! Fix all uses of UsageKeys and CourseKeys, and all of their tests.