Update for Clang 3.3