Upgrade to haskell2010