Additional changes for clang C++11 support.