14 files changed, 19 insertions, 19 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index af94c070fc2..5fd17fe7ee3 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -7,7 +7,7 @@ env = env.Clone()
 
 # Ideally 's2' would be scoped narrowly but it is spammed in all over the place by
 # db/geo unfortunately.
-env.InjectThirdPartyIncludePaths(libraries=[
+env.InjectThirdParty(libraries=[
     's2',
 ])
 
@@ -1279,7 +1279,7 @@ env.Library(
 )
 
 envWithAsio = env.Clone()
-envWithAsio.InjectThirdPartyIncludePaths(libraries=['asio'])
+envWithAsio.InjectThirdParty(libraries=['asio'])
 
 envWithAsio.CppUnitTest(
     target='logical_session_id_test',
@@ -1966,7 +1966,7 @@ env.Library(
 )
 
 asioEnv = env.Clone()
-asioEnv.InjectThirdPartyIncludePaths('asio')
+asioEnv.InjectThirdParty('asio')
 
 asioEnv.CppIntegrationTest(
     target='nesting_depth_test',
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 9c71ac46304..e66d6b4e703 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -285,7 +285,7 @@ env.Library(
 )
 
 yamlEnv = env.Clone()
-yamlEnv.InjectThirdPartyIncludePaths(libraries=['yaml'])
+yamlEnv.InjectThirdParty(libraries=['yaml'])
 yamlEnv.Library(
     target='security_file',
     source=[
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 547dddc5284..58aa4e3da35 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -512,7 +512,7 @@ env.Library(
 
 if has_option('use-cpu-profiler'):
     profEnv = env.Clone()
-    profEnv.InjectThirdPartyIncludePaths('gperftools')
+    profEnv.InjectThirdParty('gperftools')
     profEnv.Library(
         target='cpuprofiler',
         source=[
diff --git a/src/mongo/db/free_mon/SConscript b/src/mongo/db/free_mon/SConscript
index 0ba806f82a9..cc266679206 100644
--- a/src/mongo/db/free_mon/SConscript
+++ b/src/mongo/db/free_mon/SConscript
@@ -5,7 +5,7 @@ Import("free_monitoring")
 env = env.Clone()
 
 fmEnv = env.Clone()
-fmEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
+fmEnv.InjectThirdParty(libraries=['snappy'])
 
 fmEnv.Library(
     target='free_mon',
diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript
index 8be42abcbc5..14743514166 100644
--- a/src/mongo/db/ftdc/SConscript
+++ b/src/mongo/db/ftdc/SConscript
@@ -4,7 +4,7 @@ Import("env")
 env = env.Clone()
 
 ftdcEnv = env.Clone()
-ftdcEnv.InjectThirdPartyIncludePaths(libraries=['zlib'])
+ftdcEnv.InjectThirdParty(libraries=['zlib'])
 
 ftdcEnv.Library(
     target='ftdc',
diff --git a/src/mongo/db/fts/SConscript b/src/mongo/db/fts/SConscript
index 1a6d0ce6599..72d3ca6aff8 100644
--- a/src/mongo/db/fts/SConscript
+++ b/src/mongo/db/fts/SConscript
@@ -37,7 +37,7 @@ generateStopWordsList = env.Command( [ "stop_words_list.h", "stop_words_list.cpp
 env.Alias('generated-sources', generateStopWordsList)
 
 baseEnv=env.Clone()
-baseEnv.InjectThirdPartyIncludePaths(libraries=['stemmer'])
+baseEnv.InjectThirdParty(libraries=['stemmer'])
 baseEnv.Library('base_fts', [
         'fts_index_format.cpp',
         'fts_matcher.cpp',
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index 48139514fbd..21490053480 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -94,7 +94,7 @@ env.CppUnitTest(
 )
 
 serveronlyEnv = env.Clone()
-serveronlyEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
+serveronlyEnv.InjectThirdParty(libraries=['snappy'])
 serveronlyEnv.Library(
     target="index_access_method",
     source=[
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index f03305d8d53..2480340ea2d 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -357,7 +357,7 @@ env.Library(
 )
 
 pipelineeEnv = env.Clone()
-pipelineeEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
+pipelineeEnv.InjectThirdParty(libraries=['snappy'])
 pipelineeEnv.Library(
     target='pipeline',
     source=[
diff --git a/src/mongo/db/pipeline/expression.h b/src/mongo/db/pipeline/expression.h
index d02df48f9d7..3e1f1268a57 100644
--- a/src/mongo/db/pipeline/expression.h
+++ b/src/mongo/db/pipeline/expression.h
@@ -597,10 +597,10 @@ public:
      * off the timezone if not specified.
      */
     Value serialize(bool explain) const final {
+        auto timezone = _timeZone ? _timeZone->serialize(explain) : Value();
         return Value(Document{
             {_opName,
-             Document{{"date", _date->serialize(explain)},
-                      {"timezone", _timeZone ? _timeZone->serialize(explain) : Value()}}}});
+             Document{{"date", _date->serialize(explain)}, {"timezone", std::move(timezone)}}}});
     }
 
     boost::intrusive_ptr<Expression> optimize() final {
diff --git a/src/mongo/db/query/collation/SConscript b/src/mongo/db/query/collation/SConscript
index 6813ecb940f..6d5b61c660b 100644
--- a/src/mongo/db/query/collation/SConscript
+++ b/src/mongo/db/query/collation/SConscript
@@ -126,7 +126,7 @@ env.CppUnitTest(
 icuEnv = env.Clone()
 
 if not use_system_version_of_library("icu"):
-    icuEnv.InjectThirdPartyIncludePaths("icu")
+    icuEnv.InjectThirdParty("icu")
     # Since we are injecting the third-party ICU headers, we must also copy the same defines that we
     # use to configure ICU when building ICU sources. See comment in
     # src/third_party/icu4c-57.1/source/SConscript.
diff --git a/src/mongo/db/query/datetime/SConscript b/src/mongo/db/query/datetime/SConscript
index a9f8bb87746..69171d52c83 100644
--- a/src/mongo/db/query/datetime/SConscript
+++ b/src/mongo/db/query/datetime/SConscript
@@ -5,7 +5,7 @@ Import('env')
 env = env.Clone()
 
 timeZoneEnv = env.Clone()
-timeZoneEnv.InjectThirdPartyIncludePaths(libraries=['timelib'])
+timeZoneEnv.InjectThirdParty(libraries=['timelib'])
 timeZoneEnv.Library(
     target='date_time_support',
     source=[
diff --git a/src/mongo/db/sorter/SConscript b/src/mongo/db/sorter/SConscript
index 7b5dd0bdd6e..2f0014755a2 100644
--- a/src/mongo/db/sorter/SConscript
+++ b/src/mongo/db/sorter/SConscript
@@ -3,7 +3,7 @@ Import("env")
 env = env.Clone()
 
 sorterEnv = env.Clone()
-sorterEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
+sorterEnv.InjectThirdParty(libraries=['snappy'])
 sorterEnv.CppUnitTest('sorter_test',
                       'sorter_test.cpp',
                        LIBDEPS=['$BUILD_DIR/mongo/db/service_context',
diff --git a/src/mongo/db/storage/mobile/SConscript b/src/mongo/db/storage/mobile/SConscript
index 2ce89806410..5276dfd2382 100644
--- a/src/mongo/db/storage/mobile/SConscript
+++ b/src/mongo/db/storage/mobile/SConscript
@@ -3,7 +3,7 @@ Import("mobile_se")
 env = env.Clone()
 
 
-env.InjectThirdPartyIncludePaths(libraries=['sqlite'])
+env.InjectThirdParty(libraries=['sqlite'])
 
 env.Library(
     target='storage_mobile_core',
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 373931db88f..d7f1eb61b96 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -26,9 +26,9 @@ env.Library(
 
 if wiredtiger:
     wtEnv = env.Clone()
-    wtEnv.InjectThirdPartyIncludePaths(libraries=['wiredtiger'])
-    wtEnv.InjectThirdPartyIncludePaths(libraries=['zlib'])
-    wtEnv.InjectThirdPartyIncludePaths(libraries=['valgrind'])
+    wtEnv.InjectThirdParty(libraries=['wiredtiger'])
+    wtEnv.InjectThirdParty(libraries=['zlib'])
+    wtEnv.InjectThirdParty(libraries=['valgrind'])
 
     # This is the smallest possible set of files that wraps WT
     wtEnv.Library(