Added more wait helpers.