Spirit: Fixing clang regressions