cleanup: Resolve warnings about shadowed variables.