First batch of package globals gone.
More package globals nuked.