Remove surname mention.
Make it work on GHC 7.6.