Better argument management
This tag has no release notes.