Argument handling consolidated