Index: modules/comment/comment.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.admin.inc,v
retrieving revision 1.17
diff -u -p -r1.17 comment.admin.inc
--- modules/comment/comment.admin.inc	14 Mar 2009 20:13:26 -0000	1.17
+++ modules/comment/comment.admin.inc	17 Mar 2009 18:21:55 -0000
@@ -71,13 +71,11 @@ function comment_admin_overview($type = 
   $query->join('node', 'n', 'n.nid = c.nid');
   $query->addField('u', 'name', 'registered_name');
   $query->addField('n', 'title', 'node_title');
-  $query
-    ->fields('c', array('subject', 'nid', 'cid', 'comment', 'timestamp', 'status', 'name', 'homepage'))
-    ->fields('u', array('uid'))
-    ->condition('c.status', $status)
-    ->extend('PagerDefault')->extend('TableSort')
-    ->limit(50)
-    ->setHeader($header);
+  $query->fields('c', array('subject', 'nid', 'cid', 'comment', 'timestamp', 'status', 'name', 'homepage'));
+  $query->fields('u', array('uid'));
+  $query->condition('c.status', $status);
+  $query = $query->extend('PagerDefault')->limit(50);
+  $query = $query->extend('TableSort')->setHeader($header);
   $result = $query->execute();
 
 
Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 dblog.admin.inc
--- modules/dblog/dblog.admin.inc	13 Mar 2009 14:28:18 -0000	1.14
+++ modules/dblog/dblog.admin.inc	17 Mar 2009 18:21:56 -0000
@@ -55,7 +55,7 @@ function dblog_overview() {
   $output .= drupal_get_form('dblog_clear_log_form');
 
   $header = array(
-    ' ',
+    '', // Icon column.
     array('data' => t('Type'), 'field' => 'w.type'),
     array('data' => t('Date'), 'field' => 'w.wid', 'sort' => 'desc'),
     t('Message'),
@@ -65,24 +65,18 @@ function dblog_overview() {
 
   $query = db_select('watchdog', 'w');
   $query->join('users', 'u', 'w.uid = u.uid');
-  $query
-    ->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link'))
-    ->addField('u', 'name');
+  $query->fields('w', array('wid', 'uid', 'severity', 'type', 'timestamp', 'message', 'variables', 'link'));
+  $query->addField('u', 'name');
   if (!empty($filter['where'])) {
-    //setHeader may not be chainable see Line 138
-    $query
-      ->where($filter['where'], $filter['args'])
-      ->extend('PagerDefault')->extend('TableSort')
-      ->limit(50, 0)
-      ->setHeader($header);
+    $query->where($filter['where'], $filter['args']);
+    $query = $query->extend('PagerDefault')->limit(50);
+    $query = $query->extend('TableSort')->setHeader($header);
     $result = $query->execute();
+    echo $query;
   }
   else {
-    //setHeader may not be chainable see Line 138
-    $query
-      ->extend('PagerDefault')->extend('TableSort')
-      ->limit(50)
-      ->setHeader($header);
+    $query = $query->extend('PagerDefault')->limit(50);
+    $query = $query->extend('TableSort')->setHeader($header);
     $result = $query->execute();
   }
 
@@ -128,14 +122,12 @@ function dblog_top($type) {
 
   $query = db_select('watchdog', 'w');
   $query->addExpression('COUNT(wid)', 'count');
-  $query = $query
-    ->fields('w', array('message', 'variables'))
-    ->condition('w.type', $type)
-    ->groupBy('message')
-    ->groupBy('variables')
-    ->extend('PagerDefault')->extend('TableSort')
-    ->limit(30);
-  $query = $query->setHeader($header);
+  $query->fields('w', array('message', 'variables'));
+  $query->condition('w.type', $type);
+  $query->groupBy('message');
+  $query->groupBy('variables');
+  $query = $query->extend('PagerDefault')->limit(30);
+  $query = $query->extend('TableSort')->setHeader($header);
   $query->setCountQuery($count_query);
   $result = $query->execute();
 
Index: modules/poll/poll.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v
retrieving revision 1.15
diff -u -p -r1.15 poll.pages.inc
--- modules/poll/poll.pages.inc	9 Mar 2009 20:36:58 -0000	1.15
+++ modules/poll/poll.pages.inc	17 Mar 2009 18:22:04 -0000
@@ -61,19 +61,16 @@ function poll_votes($node) {
   $select = db_select('poll_vote', 'pv');
   $select->join('poll_choice', 'pc', 'pv.chid = pc.chid');
   $select->join('users', 'u', 'pv.uid = u.uid');
-  $queried_votes = $select->fields('pv', array('chid', 'uid', 'hostname', 'timestamp', 'nid'))
+  $query = $select->fields('pv', array('chid', 'uid', 'hostname', 'timestamp', 'nid'))
     ->fields('pc', array('chtext'))
     ->fields('u', array('name'))
-    ->condition('pv.nid', $node->nid)
-    ->extend('PagerDefault')
-    ->limit($votes_per_page)
-    ->extend('TableSort')
-    ->setHeader($header)
-    ->execute()
-    ->fetchAllAssoc('hostname');
+    ->condition('pv.nid', $node->nid);
+  $query = $query->extend('PagerDefault')->limit($votes_per_page);
+  $query = $query->extend('TableSort')->setHeader($header);
+  $votes = $query->execute()->fetchAllAssoc('hostname');
 
   $rows = array();
-  foreach ($queried_votes as $vote) {
+  foreach ($votes as $vote) {
     $rows[] = array(
       $vote->name ? theme('username', $vote) : check_plain($vote->hostname),
       check_plain($vote->chtext),