Small tweaks to the enum generator to allow supressing the ToString functions