Getting rid of some globals that Alloy now handles