Refactored arguments for evaluate-apply