make check fixed by reversing the order of bool-exprs, and hence matching the original order.
Post review fixes.
Minor