Sort.
Move the WaitFor* calls to their own file in Tidbits, so that they
can be used outside of unit tests.