'wait*' macros have been improved.