atrick accepted this revision. atrick added a comment. This revision is now accepted and ready to land. Neat. I wouldn't usually add complexity for an unexpected situation, but this is purely a generalization. https://reviews.llvm.org/D32104