Use replace for manipulating CourseLocator, so that deprecation is preserved

Here too.