Proposal for how to handle arguments

See bug 1102371