For the most part all code we compile with GCC2 also compiles with modern GCC and Clang, so I don’t think we have too much code to adapt to C++98 rules besides the STL. So if we can make enough adjustments that we can consider replacing GCC2 at least for OS builds, that will be very valuable.