This is somewhat in "I have no idea what I'm doing territory", but seems to do what I want and I have tests to prove it. Please advise :-) http://reviews.llvm.org/D10350 EMAIL PREFERENCES http://reviews.llvm.org/settings/panel/emailpreferences/