Rewrite around Type and Facade only (less Ruby shenanigans)