Uncommited patches for clang (the branches that aren't master will suffer push --force when I update them)