Compiles with ghc7.8, passing 4/50 tests. Fixes #141, maybe.