Improve newtype deriving