Bit of context menu housekeeping, prep for stable merge