Refactor data-types to use a common makeType factory function.