jmolloy added a subscriber: jmolloy. jmolloy accepted this revision. jmolloy added a reviewer: jmolloy. jmolloy added a comment. This revision is now accepted and ready to land. Looks like a reasonable cleanup. LGTM, thanks! https://reviews.llvm.org/D22872