Update to build with GHC 7.8

I've compiled this against GHC 7.8 and 7.6.3 - both at least compile correctly.