Implement WITH-CONDITION-RESTARTS and fix restart filtering.
Implement WITH-CONDITION-RESTARTS and fix restart filtering.

Restarts are only counted when they are associated with the condition
and their test passes, not or.

froggey/Mezzano,varjagg/Mezzano,varjagg/Mezzano,froggey/Mezzano,rvedam/Mezzano,rvedam/Mezzano