Compiles on GCC and Clang again.