waitFor: normalize interface
4.0.3