Merge branch 'nd/tree-walk-enum-cleanup'