parsing: improve parsing of arguments