Refactor IntrWait code to have a tighter loop (fixes #11)