Fix hsc2hs properly this time I think.