chandlerc accepted this revision. chandlerc added a comment. This revision is now accepted and ready to land. Do you want to add a test to the defaults file that enables both? I don't feel strongly while they're off-by-default. LGTM either way. https://reviews.llvm.org/D33810