diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt
index ba7c300091b..f8c5c0f63e9 100644
--- a/src/com/android/settings/spa/app/AllAppList.kt
+++ b/src/com/android/settings/spa/app/AllAppList.kt
@@ -64,10 +64,9 @@ private fun AllAppListPage() {
         listModel = remember { AllAppListModel() },
         showInstantApps = true,
         moreOptions = { ResetAppPreferences(resetAppDialogPresenter::open) }
-    ) { itemModel ->
+    ) {
         AppListItem(
-            itemModel = itemModel,
-            onClick = AppInfoSettingsProvider.navigator(app = itemModel.record.app),
+            onClick = AppInfoSettingsProvider.navigator(app = record.app),
         )
     }
 }
diff --git a/src/com/android/settings/spa/development/UsageStats.kt b/src/com/android/settings/spa/development/UsageStats.kt
index 302f2010b31..d98ef599f9c 100644
--- a/src/com/android/settings/spa/development/UsageStats.kt
+++ b/src/com/android/settings/spa/development/UsageStats.kt
@@ -37,9 +37,7 @@ object UsageStatsPageProvider : SettingsPageProvider {
             title = stringResource(R.string.testing_usage_stats),
             listModel = rememberContext(::UsageStatsListModel),
             primaryUserOnly = true,
-        ) { itemModel ->
-            AppListItem(itemModel) {}
-        }
+        ) { AppListItem {} }
     }
 
     @Composable
diff --git a/src/com/android/settings/spa/notification/AppListNotifications.kt b/src/com/android/settings/spa/notification/AppListNotifications.kt
index da4ebb5dc21..0e6c5e2d6da 100644
--- a/src/com/android/settings/spa/notification/AppListNotifications.kt
+++ b/src/com/android/settings/spa/notification/AppListNotifications.kt
@@ -46,9 +46,7 @@ object AppListNotificationsPageProvider : SettingsPageProvider {
         AppListPage(
             title = stringResource(R.string.app_notifications_title),
             listModel = rememberContext(::AppNotificationsListModel),
-        ) {
-            AppNotificationsItem(it)
-        }
+        ) { AppNotificationsItem() }
     }
 
     @Composable
@@ -62,24 +60,21 @@ object AppListNotificationsPageProvider : SettingsPageProvider {
 }
 
 @Composable
-private fun AppNotificationsItem(
-    itemModel: AppListItemModel<AppNotificationsRecord>,
-) {
+private fun AppListItemModel<AppNotificationsRecord>.AppNotificationsItem() {
     val appNotificationsRepository = rememberContext(::AppNotificationRepository)
     val context = LocalContext.current
     AppListSwitchItem(
-        itemModel = itemModel,
         onClick = {
             navigateToAppNotificationSettings(
                 context = context,
-                app = itemModel.record.app,
+                app = record.app,
             )
         },
-        checked = itemModel.record.controller.isEnabled.observeAsState(),
+        checked = record.controller.isEnabled.observeAsState(),
         changeable = produceState(initialValue = false) {
-            value = appNotificationsRepository.isChangeable(itemModel.record.app)
+            value = appNotificationsRepository.isChangeable(record.app)
         },
-        onCheckedChange = itemModel.record.controller::setEnabled,
+        onCheckedChange = record.controller::setEnabled,
     )
 }
 
diff --git a/src/com/android/settings/spa/system/AppLanguages.kt b/src/com/android/settings/spa/system/AppLanguages.kt
index db34cd595f1..bcb65352a27 100644
--- a/src/com/android/settings/spa/system/AppLanguages.kt
+++ b/src/com/android/settings/spa/system/AppLanguages.kt
@@ -52,9 +52,7 @@ object AppLanguagesPageProvider : SettingsPageProvider {
                     SettingsBody(stringResource(R.string.desc_app_locale_selection_supported))
                 }
             },
-        ) {
-            AppLanguageItem(it)
-        }
+        ) { AppLanguageItem() }
     }
 
     @Composable
@@ -68,16 +66,13 @@ object AppLanguagesPageProvider : SettingsPageProvider {
 }
 
 @Composable
-private fun AppLanguageItem(itemModel: AppListItemModel<AppLanguagesRecord>) {
+private fun AppListItemModel<AppLanguagesRecord>.AppLanguageItem() {
     val context = LocalContext.current
-    AppListItem(
-        itemModel = itemModel,
-        onClick = {
-            val intent = Intent(context, AppLocalePickerActivity::class.java).apply {
-                setData(Uri.parse("package:${itemModel.record.app.packageName}"))
-                putExtra("uid", itemModel.record.app.uid)
-            }
-            context.startActivity(intent)
+    AppListItem {
+        val intent = Intent(context, AppLocalePickerActivity::class.java).apply {
+            data = Uri.parse("package:${record.app.packageName}")
+            putExtra("uid", record.app.uid)
         }
-    )
-}
\ No newline at end of file
+        context.startActivity(intent)
+    }
+}