Get rid of course_index shim.

@dmitchell Please review. Let's cleanup as we go along instead of creating shims.