Fix up definition of globals.