Fix WITH-EVENT-LOOP for :wait