diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 721491def..de5128347 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -6,7 +6,6 @@
 #include "nix/util/abstract-setting-to-json.hh"
 #include "nix/util/compute-levels.hh"
 #include "nix/util/signals.hh"
-#include "nix/util/types.hh"
 
 #include <algorithm>
 #include <map>
diff --git a/src/libstore/include/nix/store/local-store.hh b/src/libstore/include/nix/store/local-store.hh
index e52d51f75..fd7e6fc36 100644
--- a/src/libstore/include/nix/store/local-store.hh
+++ b/src/libstore/include/nix/store/local-store.hh
@@ -34,7 +34,8 @@ struct OptimiseStats
     uint64_t bytesFreed = 0;
 };
 
-struct LocalBuildStoreConfig : virtual LocalFSStoreConfig {
+struct LocalBuildStoreConfig : virtual LocalFSStoreConfig
+{
 
 private:
     /**
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index e25a802ec..0d2d96e61 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -79,14 +79,12 @@ std::string LocalStoreConfig::doc()
 
 Path LocalBuildStoreConfig::getBuildDir() const
 {
-    if (settings.buildDir.get().has_value()) {
-        return *settings.buildDir.get();
-    }
-    if (buildDir.get().has_value()) {
-        return *buildDir.get();
-    }
-
-    return stateDir.get() + "/builds";
+    return
+        settings.buildDir.get().has_value()
+        ? *settings.buildDir.get()
+        : buildDir.get().has_value()
+        ? *buildDir.get()
+        : stateDir.get() + "/builds";
 }
 
 ref<Store> LocalStore::Config::openStore() const