DG: Removed indirections, $T, Naked Globals (REF-286)