Yah, that redundant test in particular is pretty embarrassing. I have a more concise version I want to use. If it weren't that the symptoms are barely noticeable on another OS and intolerable under Linux it wouldn't be worth pursuing at all.