Less global variables, moved to the globals infrastructure.