Remove shadowed variables from headers
Un-shadow a member of picojson
Remove some variable shadowing (in files touched by another cleanup branch)
Fix another batch of shadowed variables
Another batch of un-shadowing variables
Add a comment about the absurd length of map::draw_map
Merge remote-tracking branch 'dda/pr/904' into dda-master