4.10.1
Move around types, apply to other enums This doesn't include ALL abstract types, mostly if they are single-use or not at all relevant to our handling and most likely never will