Some changes.
Merge remote-tracking branch 'osandbu/ghc-api' into ghc-api