Fixes for variable shadowing (15/28)
Fixes for variable shadowing (15/28)

afh/ledger,afh/ledger,ledger/ledger,paulbdavis/ledger,paulbdavis/ledger,jwakely/ledger,paulbdavis/ledger,paulbdavis/ledger,afh/ledger,ledger/ledger,ledger/ledger,afh/ledger,duncanmortimer/ledger,jwakely/ledger,duncanmortimer/ledger,paulbdavis/ledger,jwakely/ledger,ledger/ledger,duncanmortimer/ledger,jwakely/ledger,duncanmortimer/ledger,duncanmortimer/ledger,jwakely/ledger,paulbdavis/ledger,duncanmortimer/ledger,afh/ledger,jwakely/ledger,ledger/ledger,paulbdavis/ledger,duncanmortimer/ledger,jwakely/ledger