block/dirty-bitmap: Clean up local variable shadowing