Term ID (with depth) argument & Multiple Select Hierarchical Taxonomy

I may have come across an issue related to the sub-select performed by the Views module when (1) using a hierarchal, multiple select vocabulary and (2) a term argument with depth is enabled. The sub-select is grabbing a list of node IDs when it should be selecting a list of term IDs. Here is an example to illustrate my point:

Food Vocabulary

 * Fruit (ID: 3)
     * Apple (ID: 7)
 * Sour (ID: 6)
 * Sweet (ID: 5)

Food Content Type and Example Node Attached to Terms

          Food

  Sour    Sweet    Fruit
   |
   |               Apple
   |                 |
   --------|---------
           |
      Granny Smith (of Food Content Type)

Now lets create a view to do the following: (1) select the node title and term name fields (causing JOINs with the term_hierachy and term_node tables) and (2) add a Term ID (with depth) argument.

If I select the sour food (ID: 6), this SQL and output is generated:

SELECT node.nid AS nid,
   term_data.name AS term_data_name,
   term_data.vid AS term_data_vid,
   term_data.tid AS term_data_tid,
   node.title AS node_title
 FROM node node 
 LEFT JOIN term_node term_node ON node.vid = term_node.vid
 LEFT JOIN term_data term_data ON term_node.tid = term_data.tid
 WHERE (node.type in ('food')) AND (node.vid IN (
  SELECT tn.vid FROM term_node tn
    LEFT JOIN term_hierarchy th ON th.tid = tn.tid
    LEFT JOIN term_hierarchy th1 ON th.parent = th1.tid
  WHERE tn.tid = 6
    OR th1.tid = 6
  ))

  +-----+----------------+---------------+---------------+--------------+
  | nid | term_data_name | term_data_vid | term_data_tid | node_title   |
  +-----+----------------+---------------+---------------+--------------+
  |  10 | Apple          |             2 |             7 | Granny Smith | 
  |  10 | Sour           |             2 |             6 | Granny Smith | 
  +-----+----------------+---------------+---------------+--------------+

The sub-select is returning a single row (nid = 10), but the LEFT JOINs on the term* tables are then generating duplicate results. I believe the sub-select should be selecting term_node.tid instead (like the normal Term ID --without depth-- argument generates). Like this:

SELECT node.nid AS nid,
   term_data.name AS term_data_name,
   term_data.vid AS term_data_vid,
   term_data.tid AS term_data_tid,
   node.title AS node_title
 FROM node node 
 LEFT JOIN term_node term_node ON node.vid = term_node.vid
 LEFT JOIN term_data term_data ON term_node.tid = term_data.tid
 WHERE (node.type in ('food')) AND (term_node.tid IN (
  SELECT tn.tid FROM term_node tn
    LEFT JOIN term_hierarchy th ON th.tid = tn.tid
    LEFT JOIN term_hierarchy th1 ON th.parent = th1.tid
  WHERE tn.tid = 6
    OR th1.tid = 6
  ))

  +-----+----------------+---------------+---------------+--------------+
  | nid | term_data_name | term_data_vid | term_data_tid | node_title   |
  +-----+----------------+---------------+---------------+--------------+
  |  10 | Sour           |             2 |             6 | Granny Smith | 
  +-----+----------------+---------------+---------------+--------------+

I attached a diff of changes to views_handler_argument_term_node_tid_depth.inc