Working to get rid of putToks
Small change to confirm reset of branch
Merge branch 'tokenutils' into ghc-api