Compilation fix

The final fix, 4e86750, was necessary for me to compile with GHC7.8.2.  Not sure if this is due to a change in hsc2hs or what.  Pull if it works for you, ignore if you'd like.