argument titles displaying key instead of label

I have some views with cck text fields set as the views' arguments. These text fields are configured with key|label pairs as the allowable values. As of cck-5.x-1.6-1 the titles of these views were displaying correctly-- using the label part of the key|label pair in place of %1. After upgrading, however, the views were displaying the key part in all caps instead.

I finally tracked this down to the changes in revision 1.41.2.13 to text.module (http://cvs.drupal.org/viewvc.py/drupal/contributions/modules/cck/text.mo...) in which the default argument handling is overridden and the case 'title': behavior is changed to:

return check_plain(strtoupper($query));

As a temporary fix, I can change this back to the default behavior from content_views.inc:

$item = array(key($db_info['columns']) => $query);
return content_format($field, $item, 'plain');

However, this breaks the argument's title when the Option value is set (for filtering by less than the whole value) so I'm assuming we'll have to test for this option value but I don't currently know how to do that.

Any suggestions?