I have the same opinion. IMHO, the best solution is to extend Db with information about what was parsed. But how we could solve it now? Is there any other ways to distinguish operator> from tail of "<some_operator>" ? http://reviews.llvm.org/D3646