fixup! Change Locators into UsageKeys and CourseKeys