softmmu/memory: Clean up local variable shadowing