Minor cleanup of global variables.