aaron.ballman accepted this revision. aaron.ballman added a comment. LGTM now, thank you for switching back! I was mostly worried about an unrestricted template argument in this case, not the particular form of the change. :-) https://reviews.llvm.org/D23008