Removed use of per-thread wait_struct, cleaned up a bit.