sched, wait: Use wrapper functions