diff --git a/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.kt b/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.kt
index 12166fd6d..36a980f15 100644
--- a/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.kt
+++ b/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.kt
@@ -27,7 +27,7 @@ class TranslationTests {
     private fun forEachLocale(callback: (Resources) -> Unit) {
         val locales = Locale.getAvailableLocales()
         for (locale in locales) {
-            callback.invoke(getResourcesForLocale(locale))
+            callback(getResourcesForLocale(locale))
         }
     }
 
diff --git a/app/src/commonTest/java/org/tasks/Freeze.kt b/app/src/commonTest/java/org/tasks/Freeze.kt
index 8b95357d6..53662a65a 100644
--- a/app/src/commonTest/java/org/tasks/Freeze.kt
+++ b/app/src/commonTest/java/org/tasks/Freeze.kt
@@ -6,7 +6,7 @@ import org.tasks.time.DateTimeUtils
 class Freeze {
     fun thawAfter(run: () -> Unit) {
         try {
-            run.invoke()
+            run()
         } finally {
             thaw()
         }
diff --git a/app/src/commonTest/java/org/tasks/SuspendFreeze.kt b/app/src/commonTest/java/org/tasks/SuspendFreeze.kt
index b1764a007..0234eaee5 100644
--- a/app/src/commonTest/java/org/tasks/SuspendFreeze.kt
+++ b/app/src/commonTest/java/org/tasks/SuspendFreeze.kt
@@ -7,7 +7,7 @@ class SuspendFreeze {
 
     suspend fun thawAfter(run: suspend () -> Unit) {
         try {
-            run.invoke()
+            run()
         } finally {
             thaw()
         }
diff --git a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.kt b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.kt
index 3b9c0d082..8fcec9b09 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/NavigationDrawerAdapter.kt
@@ -97,7 +97,7 @@ class NavigationDrawerAdapter @Inject constructor(
         }
     }
 
-    private fun onClickFilter(filter: FilterListItem?) = onClick.invoke(if (filter == selected) null else filter)
+    private fun onClickFilter(filter: FilterListItem?) = onClick(if (filter == selected) null else filter)
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
         val item = getItem(position)
diff --git a/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt b/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt
index 27cd0b959..7d3d79dd3 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt
+++ b/app/src/main/java/com/todoroo/astrid/core/CriterionViewHolder.kt
@@ -72,7 +72,7 @@ class CriterionViewHolder(
     }
 
     @OnClick(R.id.row)
-    fun onClick() = this.onClick.invoke(criterion.id)
+    fun onClick() = onClick(criterion.id)
 
     fun setMoving(moving: Boolean) {
         if (moving) {
diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt b/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt
index 6784affd9..ebb99a156 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterItemTouchHelper.kt
@@ -30,7 +30,7 @@ class CustomFilterItemTouchHelper(
         if (toPosition == 0) {
             return false
         }
-        onMove.invoke(src.adapterPosition, toPosition)
+        onMove(src.adapterPosition, toPosition)
         return true
     }
 
@@ -60,10 +60,10 @@ class CustomFilterItemTouchHelper(
 
         (viewHolder as CriterionViewHolder).setMoving(false)
 
-        onClear.invoke()
+        onClear()
     }
 
     override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-        onDelete.invoke(viewHolder.adapterPosition)
+        onDelete(viewHolder.adapterPosition)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
index 2f599cf6b..34de053b9 100644
--- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
@@ -82,7 +82,7 @@ class Upgrader @Inject constructor(
     private fun run(from: Int, version: Int, runnable: suspend () -> Unit) {
         if (from < version) {
             runBlocking {
-                runnable.invoke()
+                runnable()
             }
             preferences.setCurrentVersion(version)
         }
diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt
index 62e8ff465..6c86848b6 100644
--- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt
+++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksFilterUpdater.kt
@@ -141,7 +141,7 @@ class SubtasksFilterUpdater @Inject constructor(
     private suspend fun applyToDescendantsHelper(n: Node, visitor: suspend (Node) -> Unit) {
         val children = n.children
         for (child in children) {
-            visitor.invoke(child)
+            visitor(child)
             applyToDescendantsHelper(child, visitor)
         }
     }
diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt
index 722f88880..2e33fdacb 100644
--- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt
+++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.kt
@@ -105,7 +105,7 @@ class SubtasksHelper @Inject constructor(
             var i = 0
             while (i < children.size) {
                 val child = children[i]
-                val key = helper.invoke(child.uuid)
+                val key = helper(child.uuid)
                 val uuid = idMap[key]
                 if (!isValidUuid(uuid!!)) {
                     children.removeAt(i)
diff --git a/app/src/main/java/org/tasks/activities/ListPicker.kt b/app/src/main/java/org/tasks/activities/ListPicker.kt
index c654c492f..cbd97b9d9 100644
--- a/app/src/main/java/org/tasks/activities/ListPicker.kt
+++ b/app/src/main/java/org/tasks/activities/ListPicker.kt
@@ -107,7 +107,7 @@ class ListPicker : DialogFragment() {
                     .setSingleChoiceItems(filterAdapter,-1) { dialog: DialogInterface, which: Int ->
                         val item = filterAdapter.getItem(which)
                         if (item is GtasksFilter || item is CaldavFilter) {
-                            handler.invoke(item as Filter)
+                            handler(item as Filter)
                         }
                         dialog.dismiss()
                     }
diff --git a/app/src/main/java/org/tasks/data/TaskDao.kt b/app/src/main/java/org/tasks/data/TaskDao.kt
index ead737e7c..19050665b 100644
--- a/app/src/main/java/org/tasks/data/TaskDao.kt
+++ b/app/src/main/java/org/tasks/data/TaskDao.kt
@@ -102,7 +102,7 @@ abstract class TaskDao(private val database: Database) {
     open suspend fun fetchTasks(callback: suspend (SubtaskInfo) -> List<String>, subtasks: SubtaskInfo): List<TaskContainer> =
             database.withTransaction {
                 val start = if (BuildConfig.DEBUG) DateUtilities.now() else 0
-                val queries = callback.invoke(subtasks)
+                val queries = callback(subtasks)
                 val last = queries.size - 1
                 for (i in 0 until last) {
                     query(SimpleSQLiteQuery(queries[i]))
diff --git a/app/src/main/java/org/tasks/db/SuspendDbUtils.kt b/app/src/main/java/org/tasks/db/SuspendDbUtils.kt
index 1f21203bc..4b8256aec 100644
--- a/app/src/main/java/org/tasks/db/SuspendDbUtils.kt
+++ b/app/src/main/java/org/tasks/db/SuspendDbUtils.kt
@@ -8,8 +8,8 @@ object SuspendDbUtils {
             eachChunk(MAX_SQLITE_ARGS, action)
 
     suspend fun <T> Iterable<T>.eachChunk(size: Int, action: suspend (List<T>) -> Unit) =
-            chunked(size).forEach { action.invoke(it) }
+            chunked(size).forEach { action(it) }
 
     suspend fun <T, R> Iterable<T>.chunkedMap(transform: suspend (List<T>) -> Iterable<R>): List<R> =
-            dbchunk().flatMap { transform.invoke(it) }
+            dbchunk().flatMap { transform(it) }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/etesync/EteSyncClient.kt b/app/src/main/java/org/tasks/etesync/EteSyncClient.kt
index 22b7e99d7..0229a8437 100644
--- a/app/src/main/java/org/tasks/etesync/EteSyncClient.kt
+++ b/app/src/main/java/org/tasks/etesync/EteSyncClient.kt
@@ -203,7 +203,7 @@ class EteSyncClient {
         var journalEntries: List<JournalEntryManager.Entry>
         do {
             journalEntries = journalEntryManager.list(crypto, calendar.ctag, MAX_FETCH)
-            callback.invoke(journalEntries.map {
+            callback(journalEntries.map {
                 Pair.create(it, SyncEntry.fromJournalEntry(crypto, it))
             })
         } while (journalEntries.size >= MAX_FETCH)
diff --git a/app/src/main/java/org/tasks/filters/AlphanumComparator.kt b/app/src/main/java/org/tasks/filters/AlphanumComparator.kt
index 0cc593ea4..9d226d0d8 100644
--- a/app/src/main/java/org/tasks/filters/AlphanumComparator.kt
+++ b/app/src/main/java/org/tasks/filters/AlphanumComparator.kt
@@ -69,8 +69,8 @@ class AlphanumComparator<T>(private val getTitle: (T) -> String?) : Comparator<T
     }
 
     override fun compare(t1: T, t2: T): Int {
-        val s1 = getTitle.invoke(t1)
-        val s2 = getTitle.invoke(t2)
+        val s1 = getTitle(t1)
+        val s2 = getTitle(t2)
         if (s1 == null || s2 == null) {
             return 0
         }
diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt b/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt
index 0bf4b8e14..381ca9c5c 100644
--- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt
+++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.kt
@@ -186,14 +186,14 @@ class CommentBarFragment : TaskEditControlFragment() {
             options.add(getString(R.string.take_a_picture))
         }
         if (clearImageOption != null) {
-            runnables.add { clearImageOption.invoke() }
+            runnables.add { clearImageOption() }
             options.add(getString(R.string.actfm_picture_clear))
         }
         if (runnables.size == 1) {
-            runnables[0].invoke()
+            runnables[0]()
         } else {
             val listener = DialogInterface.OnClickListener { d: DialogInterface, which: Int ->
-                runnables[which].invoke()
+                runnables[which]()
                 d.dismiss()
             }
 
diff --git a/app/src/main/java/org/tasks/jobs/BackupWork.kt b/app/src/main/java/org/tasks/jobs/BackupWork.kt
index 2980eb9e5..bc78aab31 100644
--- a/app/src/main/java/org/tasks/jobs/BackupWork.kt
+++ b/app/src/main/java/org/tasks/jobs/BackupWork.kt
@@ -78,7 +78,7 @@ class BackupWork @WorkerInject constructor(
         const val DAYS_TO_KEEP_BACKUP = 7
         val BACKUP_FILE_NAME_REGEX = Regex("auto\\.[-\\d]+\\.json")
         private val FILENAME_FILTER = { f: String -> f.matches(BACKUP_FILE_NAME_REGEX) }
-        val FILE_FILTER = FileFilter { f: File -> FILENAME_FILTER.invoke(f.name) }
+        val FILE_FILTER = FileFilter { f: File -> FILENAME_FILTER(f.name) }
         private val BY_LAST_MODIFIED = { f1: File, f2: File ->
             BackupConstants.getTimestamp(f2).compareTo(BackupConstants.getTimestamp(f1))
         }
@@ -89,7 +89,7 @@ class BackupWork @WorkerInject constructor(
 
         private fun getDeleteList(fileArray: Array<DocumentFile>?) =
                 fileArray
-                        ?.filter { FILENAME_FILTER.invoke(it.name!!) }
+                        ?.filter { FILENAME_FILTER(it.name!!) }
                         ?.sortedWith(DOCUMENT_FILE_COMPARATOR)
                         ?.drop(DAYS_TO_KEEP_BACKUP)
                         ?: emptyList()
diff --git a/app/src/main/java/org/tasks/notifications/Throttle.kt b/app/src/main/java/org/tasks/notifications/Throttle.kt
index 6a503975d..04f7bf01e 100644
--- a/app/src/main/java/org/tasks/notifications/Throttle.kt
+++ b/app/src/main/java/org/tasks/notifications/Throttle.kt
@@ -21,11 +21,11 @@ internal class Throttle constructor(
             val sleep = throttle[oldest] - (currentTimeMillis() - periodMillis)
             if (sleep > 0) {
                 Timber.v("$tag: Throttled for ${sleep}ms")
-                sleeper.invoke(sleep)
+                sleeper(sleep)
             }
             try {
                 runBlocking {
-                    runnable.invoke()
+                    runnable()
                 }
             } catch (e: Exception) {
                 Timber.e(e)
diff --git a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt
index 937827e1b..35eaa5f00 100644
--- a/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt
+++ b/app/src/main/java/org/tasks/preferences/fragments/Advanced.kt
@@ -186,7 +186,7 @@ class Advanced : InjectingPreferenceFragment() {
     }
 
     private fun performAction(message: Int, callable: suspend () -> Int) = lifecycleScope.launch {
-        toaster.longToastUnformatted(message, callable.invoke())
+        toaster.longToastUnformatted(message, callable())
     }
 
     private fun resetPreferences() {
diff --git a/app/src/main/java/org/tasks/sync/Debouncer.kt b/app/src/main/java/org/tasks/sync/Debouncer.kt
index 65720a73d..e9765b3f8 100644
--- a/app/src/main/java/org/tasks/sync/Debouncer.kt
+++ b/app/src/main/java/org/tasks/sync/Debouncer.kt
@@ -12,7 +12,7 @@ class Debouncer constructor(private val tag: String, private val block: suspend
         delay(1000)
 
         if (immediate || thisCount == count) {
-            block.invoke(immediate)
+            block(immediate)
         } else {
             Timber.v("debouncing $tag")
         }
diff --git a/app/src/main/java/org/tasks/tags/TagPickerViewHolder.kt b/app/src/main/java/org/tasks/tags/TagPickerViewHolder.kt
index cae800dd6..194d25e6d 100644
--- a/app/src/main/java/org/tasks/tags/TagPickerViewHolder.kt
+++ b/app/src/main/java/org/tasks/tags/TagPickerViewHolder.kt
@@ -33,7 +33,7 @@ class TagPickerViewHolder internal constructor(
     @OnClick(R.id.tag_row)
     fun onClickRow() {
         if (tagData!!.id == null) {
-            callback.invoke(tagData!!, this)
+            callback(tagData!!, this)
         } else {
             checkBox.toggle()
         }
@@ -41,7 +41,7 @@ class TagPickerViewHolder internal constructor(
 
     @OnCheckedChanged(R.id.checkbox)
     fun onCheckedChanged() {
-        callback.invoke(tagData!!, this)
+        callback(tagData!!, this)
     }
 
     fun bind(
diff --git a/app/src/main/java/org/tasks/tasklist/HeaderViewHolder.kt b/app/src/main/java/org/tasks/tasklist/HeaderViewHolder.kt
index cc04ac528..120dda2b7 100644
--- a/app/src/main/java/org/tasks/tasklist/HeaderViewHolder.kt
+++ b/app/src/main/java/org/tasks/tasklist/HeaderViewHolder.kt
@@ -66,7 +66,7 @@ class HeaderViewHolder(
 
     init {
         header.setOnClickListener {
-            callback.invoke(sortGroup)
+            callback(sortGroup)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/ui/ActionViewModel.kt b/app/src/main/java/org/tasks/ui/ActionViewModel.kt
index 907d1b0c0..197a9bce2 100644
--- a/app/src/main/java/org/tasks/ui/ActionViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/ActionViewModel.kt
@@ -18,7 +18,7 @@ open class ActionViewModel : ViewModel() {
             errorObserver: (Throwable) -> Unit) {
         completed.observe(lifecycleOwner) {
             lifecycleOwner.lifecycleScope.launch {
-                completeObserver.invoke(it)
+                completeObserver(it)
             }
         }
         error.observe(lifecycleOwner, errorObserver)
@@ -28,7 +28,7 @@ open class ActionViewModel : ViewModel() {
         if (!inProgress) {
             inProgress = true
             try {
-                action.invoke()
+                action()
                 completed.value = true
             } catch (e: Exception) {
                 error.value = e
diff --git a/app/src/main/java/org/tasks/ui/CompletableViewModel.kt b/app/src/main/java/org/tasks/ui/CompletableViewModel.kt
index 1f79dc893..31d840cd7 100644
--- a/app/src/main/java/org/tasks/ui/CompletableViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/CompletableViewModel.kt
@@ -17,7 +17,7 @@ abstract class CompletableViewModel<T> : ViewModel() {
             errorObserver: (Throwable) -> Unit) {
         data.observe(lifecycleOwner) {
             lifecycleOwner.lifecycleScope.launch {
-                dataObserver.invoke(it)
+                dataObserver(it)
             }
         }
         error.observe(lifecycleOwner, errorObserver)
@@ -27,7 +27,7 @@ abstract class CompletableViewModel<T> : ViewModel() {
         if (!inProgress) {
             inProgress = true
             try {
-                data.postValue(callable.invoke())
+                data.postValue(callable())
             } catch (e: Exception) {
                 Timber.e(e)
                 error.postValue(e)
diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.kt b/app/src/main/java/org/tasks/ui/LocationControlSet.kt
index 97fc1fe55..2d5c2c515 100644
--- a/app/src/main/java/org/tasks/ui/LocationControlSet.kt
+++ b/app/src/main/java/org/tasks/ui/LocationControlSet.kt
@@ -108,7 +108,7 @@ class LocationControlSet : TaskEditControlFragment() {
             dialogBuilder
                     .newDialog(location.displayName)
                     .setItems(items) { _, which: Int ->
-                        options[which].second!!.invoke()
+                        options[which].second!!()
                     }
                     .show()
         }