Change some constructs that broke the build with GCC (but not Clang).