Get rid of top-scope variables