Replace a shadowed var with clearer code.