fix some errors that seem to have appeared without any changes in the source relating to incrementing enum types.