Refactor arguments.