- Removed unneeded assign-by-references to global objects