waitUntil/queryUntil into waitUntil()/queryUntil()