Merge pull request #4480 from eeckstein/partial-apply-opt2

address gottesmm's and jrose-apple's comments on the partial_apply optimization