diff --git a/src/playlist/playlistfilterparser.cpp b/src/playlist/playlistfilterparser.cpp
index d41ccacd3..224bf5f5e 100644
--- a/src/playlist/playlistfilterparser.cpp
+++ b/src/playlist/playlistfilterparser.cpp
@@ -236,10 +236,7 @@ class OrFilter : public FilterTree {
   ~OrFilter() override { qDeleteAll(children_); }
   virtual void add(FilterTree *child) { children_.append(child); }
   bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override {
-    if (std::any_of(children_.begin(), children_.end(), [row, parent, model](FilterTree *child) { return child->accept(row, parent, model); })) {
-      return true;
-    }
-    return false;
+    return std::any_of(children_.begin(), children_.end(), [row, parent, model](FilterTree *child) { return child->accept(row, parent, model); });
   }
   FilterType type() override { return Or; }
  private:
@@ -251,10 +248,7 @@ class AndFilter : public FilterTree {
   ~AndFilter() override { qDeleteAll(children_); }
   virtual void add(FilterTree *child) { children_.append(child); }
   bool accept(int row, const QModelIndex &parent, const QAbstractItemModel *const model) const override {
-    if (std::any_of(children_.begin(), children_.end(), [row, parent, model](FilterTree *child) { return !child->accept(row, parent, model); })) {
-      return false;
-    }
-    return true;
+    return !std::any_of(children_.begin(), children_.end(), [row, parent, model](FilterTree *child) { return !child->accept(row, parent, model); });
   }
   FilterType type() override { return And; }
  private:
diff --git a/src/smartplaylists/smartplaylistquerywizardplugin.cpp b/src/smartplaylists/smartplaylistquerywizardplugin.cpp
index 81acbc18a..93b1041a5 100644
--- a/src/smartplaylists/smartplaylistquerywizardplugin.cpp
+++ b/src/smartplaylists/smartplaylistquerywizardplugin.cpp
@@ -56,12 +56,7 @@ class SmartPlaylistQueryWizardPlugin::SearchPage : public QWizardPage {  // claz
     if (ui_->type->currentIndex() == 2) {  // All songs
       return true;
     }
-
-    if (std::any_of(terms_.begin(), terms_.end(), [](SmartPlaylistSearchTermWidget *widget) { return !widget->Term().is_valid(); })) {
-      return false;
-    }
-
-    return true;
+    return !std::any_of(terms_.begin(), terms_.end(), [](SmartPlaylistSearchTermWidget *widget) { return !widget->Term().is_valid(); });
   }
 
   QVBoxLayout *layout_;