CXX-20 more windows shenanigans