A clean-up pass, exploring the unification of traversals of class, variable and function templates.