Refactor argument handling.