rnk added a comment. I'm in favor of this direction. The `var || var && truth_constant` pattern match seems much more robust than the macro pattern match. It's also consistent with what we do outside of macros, so it's less special and surprising. https://reviews.llvm.org/D47687