Tweak no conflict handling of arguments