Small refactor to return a saner number of arguments.