Variables - use correct scope for some of the recently added global
system variables.