Fix up all the last bits of clang / HEAD fussiness