Improve Listener#_wait_for_changes