Clean up more local vars which shadow globals
 -Erik
6 files changed