func.go: code reorg dropped scope. Revert it.