[Snowball-discuss] More patches

[Martin Porter]

I guess this is all okay, Richard and Olly, although personally I see no
advantage in separating shadowed variables into variables with different
names,

Martin