Also add FIXMEs about removing no-longer-used enum values.
This avoids a header cycle in a subsequent patch.