Simplified the lookup of right-click menu items.