WIP on migrating functions to haskell-token-utils