Rename with_args to args and fix tests.