Even simpler handling of two-arguments wait