Update enum shorthand, ==
and reflow edition.
#4125
+345
−122
Merged