More fixes for clang. "make test" still fails for clang.