Clang fix up. Rough.