diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 2038dc781..5b7298615 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -534,6 +534,44 @@ class WP {
  */
 class WP_Object_Query {
 
+	/**
+	 * Query vars, after parsing
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 * @var array
+	 */
+	var $query_vars;
+
+	/**
+	 * Retrieve query variable.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @param string $query_var Query variable key.
+	 * @return mixed
+	 */
+	function get( $query_var ) {
+		if ( isset( $this->query_vars[$query_var] ) )
+			return $this->query_vars[$query_var];
+
+		return '';
+	}
+
+	/**
+	 * Set query variable.
+	 *
+	 * @since 3.1.0
+	 * @access public
+	 *
+	 * @param string $query_var Query variable key.
+	 * @param mixed $value Query variable value.
+	 */
+	function set( $query_var, $value ) {
+		$this->query_vars[ $query_var ] = $value;
+	}
+
 	/*
 	 * Populates the $meta_query property
 	 *
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 9ff023395..36671ac1e 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -192,9 +192,22 @@ function get_comments( $args = '' ) {
 	return $query->query( $args );
 }
 
+/**
+ * WordPress Comment Query class.
+ *
+ * @since 3.1.0
+ */
 class WP_Comment_Query extends WP_Object_Query {
 
-	function query( $args ) {
+	/**
+	 * Execute the query
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param string|array $query_vars
+	 * @return int|array
+	 */
+	function query( $query_vars ) {
 		global $wpdb;
 
 		$defaults = array(
@@ -215,8 +228,9 @@ class WP_Comment_Query extends WP_Object_Query {
 			'count' => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
-		extract( $args, EXTR_SKIP );
+		$this->query_vars = wp_parse_args( $query_vars, $defaults );
+
+		extract( $this->query_vars, EXTR_SKIP );
 
 		// $args can be whatever, only use the args defined in defaults to compute the key
 		$key = md5( serialize( compact(array_keys($defaults)) )  );
diff --git a/wp-includes/query.php b/wp-includes/query.php
index 821bd146a..496b48aaf 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -658,9 +658,8 @@ function the_comment() {
  * @since 1.5.0
  */
 class WP_Query extends WP_Object_Query {
-
 	/**
-	 * Query vars set by the user
+	 * Initial query vars
 	 *
 	 * @since 1.5.0
 	 * @access public
@@ -668,15 +667,6 @@ class WP_Query extends WP_Object_Query {
 	 */
 	var $query;
 
-	/**
-	 * Query vars, after parsing
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 * @var array
-	 */
-	var $query_vars = array();
-
 	/**
 	 * Holds the data for a single object that is queried.
 	 *
@@ -1581,35 +1571,6 @@ class WP_Query extends WP_Object_Query {
 		$this->is_feed = $is_feed;
 	}
 
-	/**
-	 * Retrieve query variable.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 *
-	 * @param string $query_var Query variable key.
-	 * @return mixed
-	 */
-	function get($query_var) {
-		if ( isset($this->query_vars[$query_var]) )
-			return $this->query_vars[$query_var];
-
-		return '';
-	}
-
-	/**
-	 * Set query variable.
-	 *
-	 * @since 1.5.0
-	 * @access public
-	 *
-	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
-	 */
-	function set($query_var, $value) {
-		$this->query_vars[$query_var] = $value;
-	}
-
 	/**
 	 * Retrieve the posts based on query variables.
 	 *
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 6bb87f238..7e35b9df8 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -374,12 +374,18 @@ class WP_User_Query extends WP_Object_Query {
 	function __construct( $query = null ) {
 		if ( !empty( $query ) ) {
 			$this->query_vars = wp_parse_args( $query, array(
-				'role' => '', 'blog_id' => $GLOBALS['blog_id'],
-				'meta_key' => '', 'meta_value' => '', 'meta_compare' => '',
-				'include' => array(), 'exclude' => array(),
+				'blog_id' => $GLOBALS['blog_id'],
+				'role' => '',
+				'meta_key' => '', 
+				'meta_value' => '',
+				'meta_compare' => '',
+				'include' => array(),
+				'exclude' => array(),
 				'search' => '',
-				'orderby' => 'login', 'order' => 'ASC',
-				'offset' => '', 'number' => '', 'count_total' => true,
+				'orderby' => 'login',
+				'order' => 'ASC',
+				'offset' => '', 'number' => '',
+				'count_total' => true,
 				'fields' => 'all',
 			) );
 
@@ -1521,4 +1527,4 @@ function _wp_get_user_contactmethods( $user = null ) {
 	return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
 }
 
-?>
\ No newline at end of file
+?>