Switch to new clang handling