Remove old 'deriving'.
Move deriving-310 to deriving.