Another batch of un-shadowing variables
Add a comment about the absurd length of map::draw_map