Another step in coalescing all the globals.