Renamed a flag, sorted one of the variants I was unsure of.