More global variables moved to globals infrastructure.
More global variables moved to globals infrastructure.