Sorry for the delays; I've been procrastinating a bit, but it's getting there. I'm currently wrapping my head around the possible TemplateArgument kinds (any pointers to example code for testing that would be welcome), and after that I think I'll be ready to post some more patches. http://llvm-reviews.chandlerc.com/D52