Updating to use set_in_wait/body style.

This is to make wait conditions more efficient.