Lightroom: Less-confusing Unmark Favorites

Many users can't figure out how to unmark a folder as a favorite when it belongs to a favorites group with more than one folder. The star appears on the folder in the Folders panel, but when they right-click the folder, the menu item is Mark Favorite rather than Unmark Favorite! The user must select all the folders in the favorites group for Unmark Favorites to appear. 

A simple change to the right-click context menu will eliminate this confusion. When the user right-clicks a folder F in the Folders panel, if F belongs to any favorites group, then a nested menu item Unmark Favorites appears, listing all the containing favorites groups:

Unmark Favorites > 
    Folder: F 
    Folders: E, F, K
    Folders: F, G, H

Selecting one of the favorites groups will delete it.

In addition, if there isn't any favorites group containing exactly the selected folders, then a separate menu item Mark Favorite(s) appears. (Note that Mark Favorite(s) and Unmark Favorite(s) can both appear, depending on which folders are selected.)

See this post and this post for examples of the confusion. A common use-case: A user selects multiple folders and does Mark Favorites. Later, she selects one of the folders and right-clicks but Mark Favorite appears, rather than Unmark Favorites. Huh? See this post for a detailed explanation of how favorite groups work.