Make it compile with new GHC
Merge branch 'greg' into errge
Bumped version to 0.5.8.