Further attempts to work around clang compilation failures.