Notes resolution about waitUntil/replace. Fixes #61