Fix neil check warnings
Merge branch 'master' of https://github.com/ndmitchell/ghc-make