Fix compile errors in clang-3.4 and (hopefully) VS2013.