Changes after upgrading to GHC 7.8.3.
Resolving differences between branches.