Make ufo-core fit for Clang