derived Data and Typeable instances to conform with GHC 7.8

In GHC 7.8 it is not allowed anymore to derive `Data` or `Typeable` instances by hand. Is this (rather simple) patch enough to fix this?