Fix -Werror=shadow

Change-Id: I30312e039c98007d6f379c3ee9b1500ddfbfc39d
Remove some temporaries around calls to SvNumberFormatter methods

Change-Id: Ib03c97a52df120bac1ac9b2b9d2e52431ead1027