t.p.northover accepted this revision. t.p.northover added a comment. This revision is now accepted and ready to land. Looks like it's clearly an improvement, and very low risk so it'd just as well go into 6.0 if there's time. https://reviews.llvm.org/D44709