Tweak and shorten combatgear.cfg.
More cleanups.
Even more cleanups, tweak flag effects.
Calming some OCD.