CaseyCarter added a comment. This new-and-improved workaround - thanks to @lichray - is unintrusive enough that I can't imagine it being unnacceptable to anyone. I'm going to go ahead and check this in. https://reviews.llvm.org/D41048