Minor refactoring: CustomTypeGenerator