nhaehnle accepted this revision. nhaehnle added a comment. This revision is now accepted and ready to land. I'm not very familiar with this code either, but the change looks reasonable to me. https://reviews.llvm.org/D50461