Codegen tweaks -> moved enums to class.