Revert to using expand-assert for the assert-true/false predicates.