Yepp, @wakeup s changes are reasonable.