Simplifying stage/unstage ContextMenu logic