Handle post-conditional `while` and `until` in AndOr

Follow-up for 9407407.