Fixes #791 - improved waitFor performance.

Immediately schedule next step if a `waitFor` condition is already met at the time the inner `waitFor` step is executed.