Consistent formatting.
Another global variable moved to globals infrastructure.
More global variables moved to globals infrastructure.
More global variables moved to globals infrastructure.