Improved(?) wait_for_messages() interface