fixup! Implement more complete function name inference
fixup! Implement more complete function name inference