simplify cmd-line args further