More Windows tap cleanup... seems solid. We'll see.