Issue #2345605 by djdevin: Clean up calls to course_enroll and course_enrollment_save.