Clean --gwa-force-consistency header and cmdline