[PATCH 0/2] Work around broken clang. Again.