iteratee added a comment. I have no more problems, and generally like your approach. It would be nice to get someone who has worked on this code before to sign off. http://reviews.llvm.org/D17736