More source cleanup

Prep for refactoring tokeniser.