Re-generated to add omitconstructor flags to the appropriate classes