Ben et al,

I'm responding to your last call for merge requests (https://mail.haskell.org/pipermail/ghc-devs/2016-August/012693.html). I would really like to get this fix to hsc2hs in if it all possible:

Thanks, Richard.