Cleaning up unnecessary cruft in util.wait