I fixed the second commit, filling enum values, to make it consistent with the existing enums. A few of them were lacking explicit values, and for them I didn't want to rewrite the whole set of existing values, so there I just matched the style of the existing value of the enum.
I omitted the third commit of this MR for now - I'll look into splitting it in the same way, but that'll take a little bit longer. (I'll either append it back to this MR, or make a new later MR, depending how the first two commits here fare.)