Fix generation of 'isa' and 'discriminator' keywords.