#1926: refactored argument handling infrastructure based on the changes suggested by ascheibe in comment:7:ticket:1926