Move the custom argument handling higher in the call stack