chandlerc added a comment. I think it'd be good to send a quick RFC / heads up email to the dev list about the refactorings you're planning here just so that folks know what the roadmap is. I'll review this in the mean time. https://reviews.llvm.org/D31102