diff --git a/src/core/file_sys/archive_ncch.cpp b/src/core/file_sys/archive_ncch.cpp
index f5ba1186c..a67dffa4e 100644
--- a/src/core/file_sys/archive_ncch.cpp
+++ b/src/core/file_sys/archive_ncch.cpp
@@ -122,8 +122,8 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
                 LOG_WARNING(
                     Service_FS,
                     "Shared Font file missing. Loading open source replacement from memory");
-                std::vector<u8> shared_font_file;
-                shared_font_file.assign(SHARED_FONT_DATA, SHARED_FONT_DATA + SHARED_FONT_DATA_len);
+                const std::vector<u8> shared_font_file(std::begin(SHARED_FONT_DATA),
+                                                       std::end(SHARED_FONT_DATA));
                 u64 romfs_offset = 0;
                 u64 romfs_size = shared_font_file.size();
                 std::unique_ptr<DelayGenerator> delay_generator =
@@ -137,9 +137,8 @@ ResultVal<std::unique_ptr<FileBackend>> NCCHArchive::OpenFile(const Path& path,
                 LOG_WARNING(
                     Service_FS,
                     "Bad Word List file missing. Loading open source replacement from memory");
-            std::vector<u8> bad_word_list_file;
-            bad_word_list_file.assign(BAD_WORD_LIST_DATA,
-                                      BAD_WORD_LIST_DATA + BAD_WORD_LIST_DATA_len);
+            const std::vector<u8> bad_word_list_file(std::begin(BAD_WORD_LIST_DATA),
+                                                     std::end(BAD_WORD_LIST_DATA));
             u64 romfs_offset = 0;
             u64 romfs_size = bad_word_list_file.size();
             std::unique_ptr<DelayGenerator> delay_generator =