Tidy up context menu stuff

Tiny bit of cleanup, nothing special.