Stylistic updates for test files
Preparing to process globals correctly
Fixed global variable processing; now addrtaken and toplevel variables are disjoint