Well, if there IS a relevant quality captured by "is a DefTree, Return, Function, or Import" then it's about time to encapsulate it. Do you want to take this on a spin with that broader view? I'd be curious what falls in there and whether we can use that info to construct failures.