[options] PEP8 and simpler --merge-output-format handling (#4673)