peter.smith accepted this revision. peter.smith added a comment. This revision is now accepted and ready to land. I think the change looks fine and it looks small enough for me to approve. http://reviews.llvm.org/D21022