Here's a plan: Stuart commits his improvements, we then improve the code snippet in TimeUnit.timedWait, then change wait(long, int) api note to point at that. We can also add a "time-less" wait loop code snippet to the spec for nullary wait().