Optimization: don't generate lots of unneeded calls during expansion.
This undoes part of commit f589, which caused us to be a lot slower on Parse.1 at depth 3.