Better behaviour for menus for declarations