Implement r.args
Remove a TODO
Collapse similar errors
Merge branch 'michel_args' into next