Fix the variable context menu, too.