Reformatted some of the enum macros a bit.

[#57444056]