This turns expect zones into step zones to avoid handling them specially.
The only observable difference is that `expect.toPass()` and `expect.poll()`
are now reported as a step with `category: 'step'` instead of `category: 'expect'`.
This actually better reflects reality, because these expects are
retriable steps that execute other expects inside, as seen from the tests.
b623934b2b