Minor cleanup to simplify the tree-walk code, simplify function naming,
too.