And again clang-format does something I don't like: - if (found != end && std::strncmp(found->name, name, len) == 0 && found->name[len] == 0) return found; + if (found != end && std::strncmp(found->name, name, len) == 0 && found->name[len] == 0) + return found; I *know* this is a bit of a long line. I would still quite like having no brace-less multi-line if *ever*. Either put the body on the same line, or add braces. Blergh