Fix more thumb+clang problems.