[PATCH] cleanup next_tid()