It��s kind of a nasty diff, but I couldn��t find a way to break it into a series where each step was functionally correct without introducing (and later fixing) a bunch of code duplication, which really didn��t make it more readable. The nested loop(s) were just fundamentally the wrong shape should seemingly just be one loop, which checks for alertable wakeup/handle completion/message/sleep inside. it's not too hard to read side-by-side if you use a tool like meld that can ignore leading whitespace and lets you add synchronization points that force it to line up the various almost-common hunks that were moved around.