WP 3.0b1 Menu highlighting for subpages and category single pages

The new menu has a class current-menu-item to highlight the menu item when you are on the current page. But when I go to a subpage I cannot find an extra class like parent-menu-item or ancestor-menu-item to keep the parent menu item highlighted in the menu.

Similarly, when I use a link to a category in the menu. I can highlight it with current-menu-item. But when the user clicks in the listing to go to a single post in that category, the menu-item is no longer highlighted as it has no current-menu-item class or other class to pick up.

Is something like this still in the works? Or is there another way to do this with the great new menu system.