Further attempts to work around clang bugs.