diff --git a/ELF/Config.h b/ELF/Config.h
index bb3608d..27274d6 100644
--- a/ELF/Config.h
+++ b/ELF/Config.h
@@ -138,7 +138,7 @@
 
   std::unique_ptr<BitcodeCompiler> lto;
   std::vector<InputFile *> files;
-  std::optional<InputFile *> armCmseImpLib;
+  InputFile *armCmseImpLib = nullptr;
 
 public:
   SmallVector<std::pair<StringRef, unsigned>, 0> archiveFiles;
diff --git a/ELF/InputFiles.cpp b/ELF/InputFiles.cpp
index 4c614c8..1104433 100644
--- a/ELF/InputFiles.cpp
+++ b/ELF/InputFiles.cpp
@@ -330,11 +330,11 @@
 extern template void ObjFile<ELF64LE>::importCmseSymbols();
 extern template void ObjFile<ELF64BE>::importCmseSymbols();
 
-template <class ELFT> static void doParseArmCMSEImportLib(InputFile *file) {
-  cast<ObjFile<ELFT>>(file)->importCmseSymbols();
+template <class ELFT> static void doParseArmCMSEImportLib(InputFile &file) {
+  cast<ObjFile<ELFT>>(file).importCmseSymbols();
 }
 
-void elf::parseArmCMSEImportLib(InputFile *file) {
+void elf::parseArmCMSEImportLib(InputFile &file) {
   invokeELFT(doParseArmCMSEImportLib, file);
 }
 
diff --git a/ELF/InputFiles.h b/ELF/InputFiles.h
index 3beb5a3..7d5dd34 100644
--- a/ELF/InputFiles.h
+++ b/ELF/InputFiles.h
@@ -49,7 +49,7 @@
 template <class ELFT> void doParseFile(InputFile *file);
 void parseFile(InputFile *file);
 
-void parseArmCMSEImportLib(InputFile *file);
+void parseArmCMSEImportLib(InputFile &file);
 
 // The root class of input files.
 class InputFile {