Remove retrieveTokens in favour of one of retrieveTokensFinal or retrieveTokensInterim
Cleaning up in preparation for token realignment
Raise ghc-mod lwer bound to match version with Internals exposed