Fixed scoping of menu variables.