Unreviewed, fix Windows build. Windows doesn't take kindly to private classes that...