Include side data in `wait` requests

This should fix a number of bugs.