Various hsc2hs improvements