Turned the remaining static enums into dynamic ones.

A couple of extra enums that MM flagged.