Support non-collection types as top-level in generator