Re-work the newtype-deriving support