diff --git a/mailnews/addrbook/src/nsAbManager.cpp b/mailnews/addrbook/src/nsAbManager.cpp
index a863fd1160..3ba936e3f1 100644
--- a/mailnews/addrbook/src/nsAbManager.cpp
+++ b/mailnews/addrbook/src/nsAbManager.cpp
@@ -544,7 +544,7 @@ NS_IMETHODIMP nsAbManager::ExportAddressBook(mozIDOMWindowProxy *aParentWin, nsI
                                     ArrayLength(formatStrings), getter_Copies(title));
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = filePicker->Init(aParentWin, title, nsIFilePicker::modeSave, /*aRequireInteraction = */ false);
+  rv = filePicker->Init(aParentWin, title, nsIFilePicker::modeSave, false);
   NS_ENSURE_SUCCESS(rv, rv);
 
   filePicker->SetDefaultString(dirName);
diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp
index 3bd3cdfcf7..953b462b6a 100644
--- a/mailnews/base/src/nsMessenger.cpp
+++ b/mailnews/base/src/nsMessenger.cpp
@@ -358,7 +358,7 @@ nsMessenger::PromptIfFileExists(nsIFile *file)
       GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr);
       filePicker->Init(mWindow,
                        saveAttachmentStr,
-                       nsIFilePicker::modeSave, /*aRequireInteraction = */ false);
+                       nsIFilePicker::modeSave, false);
       filePicker->SetDefaultString(path);
       filePicker->AppendFilters(nsIFilePicker::filterAll);
 
@@ -816,7 +816,7 @@ nsMessenger::SaveOneAttachment(const char * aContentType, const char * aURL,
 
   GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr);
   filePicker->Init(mWindow, saveAttachmentStr,
-                   nsIFilePicker::modeSave, /*aRequireInteraction = */ false);
+                   nsIFilePicker::modeSave, false);
   filePicker->SetDefaultString(defaultDisplayString);
 
   // Check if the attachment file name has an extension (which must not
@@ -909,7 +909,7 @@ nsMessenger::SaveAllAttachments(uint32_t count,
   GetString(NS_LITERAL_STRING("SaveAllAttachments"), saveAttachmentStr);
   filePicker->Init(mWindow,
                    saveAttachmentStr,
-                   nsIFilePicker::modeGetFolder, /*aRequireInteraction = */ false);
+                   nsIFilePicker::modeGetFolder, false);
 
   rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir));
   if (NS_SUCCEEDED(rv) && lastSaveDir)
@@ -1195,7 +1195,7 @@ nsMessenger::GetSaveAsFile(const nsAString& aMsgFilename, int32_t *aSaveAsFileTy
   NS_ENSURE_SUCCESS(rv, rv);
   nsString saveMailAsStr;
   GetString(NS_LITERAL_STRING("SaveMailAs"), saveMailAsStr);
-  filePicker->Init(mWindow, saveMailAsStr, nsIFilePicker::modeSave, /*aRequireInteraction = */ false);
+  filePicker->Init(mWindow, saveMailAsStr, nsIFilePicker::modeSave, false);
 
   // if we have a non-null filename use it, otherwise use default save message one
   if (aMsgFilename.IsEmpty())
@@ -1318,7 +1318,7 @@ nsMessenger::GetSaveToDir(nsIFile **aSaveDir)
 
   nsString chooseFolderStr;
   GetString(NS_LITERAL_STRING("ChooseFolder"), chooseFolderStr);
-  filePicker->Init(mWindow, chooseFolderStr, nsIFilePicker::modeGetFolder, /*aRequireInteraction = */ false);
+  filePicker->Init(mWindow, chooseFolderStr, nsIFilePicker::modeGetFolder, false);
 
   nsCOMPtr<nsIFile> lastSaveDir;
   rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir));
diff --git a/parser/html/nsHtml5MetaScanner.cpp b/parser/html/nsHtml5MetaScanner.cpp
index f7beddafd5..04c43717df 100644
--- a/parser/html/nsHtml5MetaScanner.cpp
+++ b/parser/html/nsHtml5MetaScanner.cpp
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2007 Henri Sivonen
  * Copyright (c) 2008-2015 Mozilla Foundation
- * Copyright (c) 2018-2020 Moonchild Productions
+ * Copyright (c) 2018-2021 Moonchild Productions
  * Copyright (c) 2020 Binary Outcast
  *
  * Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/parser/html/nsHtml5MetaScanner.h b/parser/html/nsHtml5MetaScanner.h
index a25acd213c..6af25efe67 100644
--- a/parser/html/nsHtml5MetaScanner.h
+++ b/parser/html/nsHtml5MetaScanner.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2007 Henri Sivonen
  * Copyright (c) 2008-2015 Mozilla Foundation
- * Copyright (c) 2018-2020 Moonchild Productions
+ * Copyright (c) 2018-2021 Moonchild Productions
  * Copyright (c) 2020 Binary Outcast
  *
  * Permission is hereby granted, free of charge, to any person obtaining a 
diff --git a/parser/html/nsHtml5Tokenizer.h b/parser/html/nsHtml5Tokenizer.h
index 4572cc8478..0e36226e61 100644
--- a/parser/html/nsHtml5Tokenizer.h
+++ b/parser/html/nsHtml5Tokenizer.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2005-2007 Henri Sivonen
  * Copyright (c) 2007-2015 Mozilla Foundation
- * Copyright (c) 2018-2020 Moonchild Productions
+ * Copyright (c) 2018-2021 Moonchild Productions
  * Copyright (c) 2020 Binary Outcast
  * Portions of comments Copyright 2004-2010 Apple Computer, Inc., Mozilla
  * Foundation, and Opera Software ASA.