Tighten Safe Haskell bounds, fixes new warning in GHC 7.10.

Some of the Safe Haskell bounds can be improved. This also fixes warnings that will appear in 7.10 where we have a new warning flag (`--fwarn-trustworthy-safe`) that warns when a trustworthy module could be instead marked safe.