Add wait helpers to 0.9.x

Added a few simple wait helpers.