this is a new waiting helper safe even if we are left on a waitqueue.
This version addresses Alan's concerns about ifdefs. Please apply.

  - add delay helper that is safe even if we are still on another waitqueue