diff --git a/classes/Avatar.php b/classes/Avatar.php
index c7f6a56b04..02874b902b 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -51,12 +51,14 @@ class Avatar extends Managed_DataObject
     }
 
     // We clean up the file, too
-    function delete()
+    function delete($useWhere=false)
     {
         $filename = $this->filename;
-        if (parent::delete() && file_exists(Avatar::path($filename))) {
+        if (file_exists(Avatar::path($filename))) {
             @unlink(Avatar::path($filename));
         }
+
+        return parent::delete($useWhere);
     }
 
     /*
diff --git a/classes/Config.php b/classes/Config.php
index 33a556e579..899396d710 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -115,10 +115,10 @@ class Config extends Managed_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
-        $result = parent::delete();
-        if ($result) {
+        $result = parent::delete($useWhere);
+        if ($result !== false) {
             Config::_blowSettingsCache();
         }
         return $result;
diff --git a/classes/Consumer.php b/classes/Consumer.php
index b1ff6d9e1a..68e973bfb0 100644
--- a/classes/Consumer.php
+++ b/classes/Consumer.php
@@ -54,14 +54,14 @@ class Consumer extends Managed_DataObject
      * XXX: Should this happen in an OAuthDataStore instead?
      *
      */
-    function delete()
+    function delete($useWhere=false)
     {
         // XXX: Is there any reason NOT to do this kind of cleanup?
 
         $this->_deleteTokens();
         $this->_deleteNonces();
 
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     function _deleteTokens()
diff --git a/classes/Fave.php b/classes/Fave.php
index 53d60b3a82..beeda9aafd 100644
--- a/classes/Fave.php
+++ b/classes/Fave.php
@@ -78,7 +78,7 @@ class Fave extends Managed_DataObject
         return $fave;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $profile = Profile::getKV('id', $this->user_id);
         $notice  = Notice::getKV('id', $this->notice_id);
@@ -87,7 +87,7 @@ class Fave extends Managed_DataObject
 
         if (Event::handle('StartDisfavorNotice', array($profile, $notice, &$result))) {
 
-            $result = parent::delete();
+            $result = parent::delete($useWhere);
             self::blow('fave:list-ids:notice_id:%d', $this->notice_id);
             self::blow('popular');
 
diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index e53b1ebb4c..1d2733738f 100644
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -84,12 +84,12 @@ class File_to_post extends Managed_DataObject
         }
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $f = File::getKV('id', $this->file_id);
         if (!empty($f)) {
             $f->blowCache();
         }
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 }
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index f9ace16ce6..55eecd807e 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -401,10 +401,10 @@ class Memcached_DataObject extends Safe_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $this->decache(); # while we still have the values!
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 
     static function memcache() {
diff --git a/classes/Notice.php b/classes/Notice.php
index df05ce4650..4e5a83a859 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -162,7 +162,7 @@ class Notice extends Managed_DataObject
         $this->_profile = $profile;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         // For auditing purposes, save a record that the notice
         // was deleted.
@@ -171,11 +171,11 @@ class Notice extends Managed_DataObject
         // insert fails.
         $deleted = Deleted_notice::getKV('id', $this->id);
 
-        if (!$deleted) {
+        if (!$deleted instanceof Deleted_notice) {
             $deleted = Deleted_notice::getKV('uri', $this->uri);
         }
 
-        if (!$deleted) {
+        if (!$deleted instanceof Deleted_notice) {
             $deleted = new Deleted_notice();
 
             $deleted->id         = $this->id;
@@ -202,7 +202,7 @@ class Notice extends Managed_DataObject
             // NOTE: we don't clear queue items
         }
 
-        $result = parent::delete();
+        $result = parent::delete($useWhere);
 
         $this->blowOnDelete();
         return $result;
diff --git a/classes/Oauth_application.php b/classes/Oauth_application.php
index 90218e93cb..b29fdfe41b 100644
--- a/classes/Oauth_application.php
+++ b/classes/Oauth_application.php
@@ -139,14 +139,14 @@ class Oauth_application extends Managed_DataObject
         }
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $this->_deleteAppUsers();
 
         $consumer = $this->getConsumer();
         $consumer->delete();
 
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     function _deleteAppUsers()
diff --git a/classes/Profile.php b/classes/Profile.php
index b2dab519a1..50cbeb3ac4 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -869,7 +869,7 @@ class Profile extends Managed_DataObject
         return parent::update($dataObject);
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $this->_deleteNotices();
         $this->_deleteSubscriptions();
@@ -891,7 +891,7 @@ class Profile extends Managed_DataObject
             $inst->delete();
         }
 
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     function _deleteNotices()
diff --git a/classes/Profile_list.php b/classes/Profile_list.php
index 509a1df242..0ad8106e31 100644
--- a/classes/Profile_list.php
+++ b/classes/Profile_list.php
@@ -334,7 +334,7 @@ class Profile_list extends Managed_DataObject
      * @return boolean success
      */
 
-    function delete()
+    function delete($useWhere=false)
     {
         // force delete one item at a time.
         if (empty($this->id)) {
@@ -349,7 +349,7 @@ class Profile_list extends Managed_DataObject
 
         self::blow('profile:lists:%d', $this->tagger);
 
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 
     /**
diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
index 5256aa13c8..6d6f49bedc 100644
--- a/classes/Profile_tag.php
+++ b/classes/Profile_tag.php
@@ -322,10 +322,10 @@ class Profile_tag extends Managed_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
-        $result = parent::delete();
-        if ($result) {
+        $result = parent::delete($useWhere);
+        if ($result !== false) {
             self::blow('profile_list:tagged_count:%d:%s', 
                        $this->tagger,
                        $this->tag);
diff --git a/classes/Profile_tag_subscription.php b/classes/Profile_tag_subscription.php
index b088023fab..f7b1553300 100644
--- a/classes/Profile_tag_subscription.php
+++ b/classes/Profile_tag_subscription.php
@@ -127,10 +127,10 @@ class Profile_tag_subscription extends Managed_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
-        $result = parent::delete();
-        if ($result) {
+        $result = parent::delete($useWhere);
+        if ($result !== false) {
             self::blow('profile_list:subscriber_count:%d', 
                        $this->profile_tag_id);
         }
diff --git a/classes/Safe_DataObject.php b/classes/Safe_DataObject.php
index 622b57f290..b4c251c475 100644
--- a/classes/Safe_DataObject.php
+++ b/classes/Safe_DataObject.php
@@ -108,7 +108,7 @@ class Safe_DataObject extends DB_DataObject
      * @return mixed
      * @throws Exception
      */
-    function __call($method, array $params)
+    function __call($method, $params)
     {
         $return = null;
         // Yes, that's _call with one underscore, which does the
diff --git a/classes/Status_network.php b/classes/Status_network.php
index 863dea98b4..9874030ba0 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -183,10 +183,10 @@ class Status_network extends Safe_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $this->decache(); # while we still have the values!
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 
     /**
diff --git a/classes/Status_network_tag.php b/classes/Status_network_tag.php
index b7ea2cff3a..9e5ff89be3 100644
--- a/classes/Status_network_tag.php
+++ b/classes/Status_network_tag.php
@@ -125,11 +125,10 @@ class Status_network_tag extends Safe_DataObject
         return $ret;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
-        $ret = parent::delete();
         $this->decache();
-        return $ret;
+        return parent::delete($useWhere);
     }
 
     static function withTag($tag)
diff --git a/classes/User.php b/classes/User.php
index aaf5f91526..24a03b62fd 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -678,11 +678,11 @@ class User extends Managed_DataObject
         return $this->getProfile()->hasRight($right);
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         if (empty($this->id)) {
             common_log(LOG_WARNING, "Ambiguous User->delete(); skipping related tables.");
-            return parent::delete();
+            return parent::delete($useWhere);
         }
 
         try {
@@ -710,7 +710,7 @@ class User extends Managed_DataObject
         $this->_deleteTags();
         $this->_deleteBlocks();
 
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     function _deleteTags()
diff --git a/classes/User_group.php b/classes/User_group.php
index efac365da2..6f3c7038a7 100644
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -727,11 +727,11 @@ class User_group extends Managed_DataObject
      * are not de-cached in the UI, including the sidebar lists on
      * GroupsAction
      */
-    function delete()
+    function delete($useWhere=false)
     {
         if (empty($this->id)) {
             common_log(LOG_WARNING, "Ambiguous User_group->delete(); skipping related tables.");
-            return parent::delete();
+            return parent::delete($useWhere);
         }
 
         try {
@@ -779,7 +779,7 @@ class User_group extends Managed_DataObject
         // blow the cached ids
         self::blow('user_group:notice_ids:%d', $this->id);
 
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 
     public function update($dataObject=false)
diff --git a/plugins/ActivitySpam/classes/spam_score.php b/plugins/ActivitySpam/classes/spam_score.php
index 2ae32fbfaa..5c583a2e07 100644
--- a/plugins/ActivitySpam/classes/spam_score.php
+++ b/plugins/ActivitySpam/classes/spam_score.php
@@ -100,11 +100,11 @@ class Spam_score extends Managed_DataObject
         return $score;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         self::blow('spam_score:notice_ids');
         self::blow('spam_score:notice_ids;last');
-        parent::delete();
+        return parent::delete($useWhere);
     }
 
     /**
diff --git a/plugins/Event/classes/RSVP.php b/plugins/Event/classes/RSVP.php
index cea916c234..521e811036 100644
--- a/plugins/Event/classes/RSVP.php
+++ b/plugins/Event/classes/RSVP.php
@@ -399,9 +399,9 @@ class RSVP extends Managed_DataObject
                        $eventTitle);
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         self::blow('rsvp:for-event:%s', $event->id);
-        parent::delete();
+        return parent::delete($useWhere);
     }
 }