Simplify thd_wait_begin. given how seldom they are called, calling current_thd one more time  is not going to be anything performance relevant.

Also use thd_wait_begin/end for thr_lock and sync callbacks.