#617, fix up to take account of template haskell variables
Remove two redundant notIn annotations