Address PR feedback and simplify course detection.