Remove explicit enum integer values. They don't appear to be needed, and