Backing stdx::mutex with a critical section on windows would provide better traceability (by allowing the debugger to see who owns what lock). It's a cost, but for debug builds we could enable it (and switch over stdx::condition_variable to be a condition_variable_any, to accept our stdx::mutex in it's wait).