labath added a comment. Yeah, feel free to take over. I was not planning to do any more work here - just wanted to wrap things up. I am going to commit this then, and leave the rest to you. https://reviews.llvm.org/D26393