Less global variables, more in the globals infrastructure.