diff --git a/src/highlighter_group.cc b/src/highlighter_group.cc
index 4379c4c5..86ded81a 100644
--- a/src/highlighter_group.cc
+++ b/src/highlighter_group.cc
@@ -48,7 +48,7 @@ Completions HighlighterGroup::complete_child(StringView path, ByteCount cursor_p
 
     auto condition = [=](const HighlighterMap::value_type& hl)
     {
-        return not group || hl.second->has_children();
+        return not group or hl.second->has_children();
     };
     return { 0, 0, m_highlighters.complete_id_if(path, cursor_pos, condition) };
 }
diff --git a/src/insert_completer.hh b/src/insert_completer.hh
index d7580b64..5d2d72ec 100644
--- a/src/insert_completer.hh
+++ b/src/insert_completer.hh
@@ -24,7 +24,7 @@ struct InsertCompleterDesc
     {}
 
     bool operator==(const InsertCompleterDesc& other) const
-    { return mode == other.mode && param == other.param; }
+    { return mode == other.mode and param == other.param; }
 
     bool operator!=(const InsertCompleterDesc& other) const
     { return !(*this == other); }
diff --git a/src/interned_string.hh b/src/interned_string.hh
index 43df5fb4..d875829d 100644
--- a/src/interned_string.hh
+++ b/src/interned_string.hh
@@ -48,7 +48,7 @@ public:
 
     InternedString& operator=(const InternedString& str)
     {
-        if (str.data() == data() && str.length() == length())
+        if (str.data() == data() and str.length() == length())
             return *this;
         static_cast<StringView&>(*this) = str;
         if (str.m_slot != m_slot)
diff --git a/src/main.cc b/src/main.cc
index 53b66c8f..0dba42f2 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -43,7 +43,7 @@ void run_unit_tests();
 String runtime_directory()
 {
     char buffer[2048];
-#if defined(__linux__) || defined(__CYGWIN__)
+#if defined(__linux__) or defined(__CYGWIN__)
     ssize_t res = readlink("/proc/self/exe", buffer, 2048);
     kak_assert(res != -1);
     buffer[res] = '\0';