diff --git a/stratosphere/ncm/source/impl/ncm_content_manager.cpp b/stratosphere/ncm/source/impl/ncm_content_manager.cpp
index 7161cf65d..084e9c8f9 100644
--- a/stratosphere/ncm/source/impl/ncm_content_manager.cpp
+++ b/stratosphere/ncm/source/impl/ncm_content_manager.cpp
@@ -201,7 +201,7 @@ namespace ams::ncm::impl {
             return FindContentMetaDatabaseEntry(out, storage_id);
         }
 
-        inline Result GetContentStorageNotActiveResult(StorageId storage_id) {
+        ALWAYS_INLINE Result GetContentStorageNotActiveResult(StorageId storage_id) {
             switch (storage_id) {
                 case StorageId::GameCard:
                     return ResultGameCardContentStorageNotActive();
@@ -216,7 +216,7 @@ namespace ams::ncm::impl {
             }
         }
 
-        inline Result GetContentMetaDatabaseNotActiveResult(StorageId storage_id) {
+        ALWAYS_INLINE Result GetContentMetaDatabaseNotActiveResult(StorageId storage_id) {
             switch (storage_id) {
                 case StorageId::GameCard:
                     return ResultGameCardContentMetaDatabaseNotActive();
@@ -241,7 +241,7 @@ namespace ams::ncm::impl {
             return ResultSuccess();
         }
 
-        void ReplaceMountName(char *out_path, const char *mount_name, const char *root_path) {
+        inline void ReplaceMountName(char *out_path, const char *mount_name, const char *root_path) {
             strcpy(out_path, mount_name);
             strcat(out_path, strchr(root_path, ':'));
         }
diff --git a/stratosphere/ncm/source/impl/ncm_placeholder_accessor.cpp b/stratosphere/ncm/source/impl/ncm_placeholder_accessor.cpp
index 659bc88d4..16c015a1b 100644
--- a/stratosphere/ncm/source/impl/ncm_placeholder_accessor.cpp
+++ b/stratosphere/ncm/source/impl/ncm_placeholder_accessor.cpp
@@ -22,6 +22,17 @@
 
 namespace ams::ncm::impl {
 
+    namespace {
+
+        ALWAYS_INLINE Result ConvertNotFoundResult(Result r) {
+            R_TRY_CATCH(r) {
+                R_CONVERT(ams::fs::ResultPathNotFound, ncm::ResultPlaceHolderNotFound())
+            } R_END_TRY_CATCH;
+            return ResultSuccess();
+        }
+
+    }
+
     Result PlaceHolderAccessor::Open(FILE** out_handle, PlaceHolderId placeholder_id) {
         R_UNLESS(!this->LoadFromCache(out_handle, placeholder_id), ResultSuccess());
         char placeholder_path[FS_MAX_PATH] = {0};
@@ -57,23 +68,19 @@ namespace ams::ncm::impl {
 
     PlaceHolderAccessor::CacheEntry *PlaceHolderAccessor::GetFreeEntry() {
         /* Try to find an already free entry. */
-        CacheEntry *entry = this->FindInCache(InvalidPlaceHolderId);
-        
-        if (entry) {
+        if (CacheEntry *entry = this->FindInCache(InvalidPlaceHolderId); entry != nullptr) {
             return entry;
         }
 
         /* Get the oldest entry. */
-        {
-            entry = &this->caches[0];
-            for (size_t i = 1; i < MaxCaches; i++) {
-                if (entry->counter > this->caches[i].counter) {
-                    entry = &this->caches[i];
-                }
+        CacheEntry *entry = &this->caches[0];
+        for (size_t i = 1; i < MaxCaches; i++) {
+            if (entry->counter > this->caches[i].counter) {
+                entry = &this->caches[i];
             }
-            this->Invalidate(entry);
-            return entry;
         }
+        this->Invalidate(entry);
+        return entry;
     }
 
     void PlaceHolderAccessor::StoreToCache(FILE *handle, PlaceHolderId placeholder_id) {
@@ -106,9 +113,9 @@ namespace ams::ncm::impl {
             return 1;
         } else if (this->make_placeholder_path_func == static_cast<MakePlaceHolderPathFunc>(path::MakePlaceHolderPathHashByteLayered)) {
             return 2;
+        } else {
+            AMS_ABORT();
         }
-
-        AMS_ABORT();
     }
 
     void PlaceHolderAccessor::GetPath(char *placeholder_path_out, PlaceHolderId placeholder_id) {
@@ -135,12 +142,7 @@ namespace ams::ncm::impl {
         char placeholder_path[FS_MAX_PATH] = {0};
 
         this->GetPath(placeholder_path, placeholder_id);
-
-        if (std::remove(placeholder_path) != 0) {
-            R_TRY_CATCH(fsdevGetLastResult()) {
-                R_CONVERT(ams::fs::ResultPathNotFound, ncm::ResultPlaceHolderNotFound())
-            } R_END_TRY_CATCH;
-        }
+        R_UNLESS(std::remove(placeholder_path) == 0, ConvertNotFoundResult(fsdevGetLastResult()));
 
         return ResultSuccess();
     }
@@ -148,13 +150,8 @@ namespace ams::ncm::impl {
     Result PlaceHolderAccessor::Write(PlaceHolderId placeholder_id, size_t offset, const void *buffer, size_t size) {
         FILE *f = nullptr;
 
-        R_TRY_CATCH(this->Open(&f, placeholder_id)) {
-            R_CONVERT(ams::fs::ResultPathNotFound, ncm::ResultPlaceHolderNotFound())
-        } R_END_TRY_CATCH;
-
-        ON_SCOPE_EXIT {
-            this->StoreToCache(f, placeholder_id);
-        };
+        R_TRY(ConvertNotFoundResult(this->Open(&f, placeholder_id)));
+        ON_SCOPE_EXIT { this->StoreToCache(f, placeholder_id); };
 
         R_TRY(fs::WriteFile(f, offset, buffer, size, !this->delay_flush));
         return ResultSuccess();
@@ -163,11 +160,7 @@ namespace ams::ncm::impl {
     Result PlaceHolderAccessor::SetSize(PlaceHolderId placeholder_id, size_t size) {
         char placeholder_path[FS_MAX_PATH] = {0};
         this->MakePath(placeholder_path, placeholder_id);
-        if (truncate(placeholder_path, size) == -1) {
-            R_TRY_CATCH(fsdevGetLastResult()) {
-                R_CONVERT(ams::fs::ResultPathNotFound, ncm::ResultPlaceHolderNotFound())
-            } R_END_TRY_CATCH;
-        }
+        R_UNLESS(truncate(placeholder_path, size) != -1, ConvertNotFoundResult(fsdevGetLastResult()));
 
         return ResultSuccess();
     }
diff --git a/stratosphere/ncm/source/ncm_fs.hpp b/stratosphere/ncm/source/ncm_fs.hpp
index ee68e4fe7..7b0611f8d 100644
--- a/stratosphere/ncm/source/ncm_fs.hpp
+++ b/stratosphere/ncm/source/ncm_fs.hpp
@@ -22,7 +22,7 @@
 namespace ams::ncm::fs {
 
     Result OpenFile(FILE** out, const char *path, u32 mode);
-    Result WriteFile(FILE *f, size_t offset, const void *buffer, size_t size, u32 option);
+    Result WriteFile(FILE *f, size_t offset, const void *buffer, size_t size, ams::fs::WriteOption option);
     Result ReadFile(FILE *f, size_t offset, void *buffer, size_t size);
 
     Result HasFile(bool *out, const char *path);