Updates for haskell-token-utils package