Refactor another time the parsing of argument...