More refactoring of commonality, also test unroutable mail
Prefer GHC Generics over SYB generics