Zubin pushed new branch wip/annotation-fixes at
Glasgow Haskell Compiler / GHC