do a little less work in the generated caller (i have not run tests on this change)