fixup! Implement more complete function name inference

I think this is a good simplification because fewer details of the
"stack" abstraction leak into the application logic.