Make small style refactors.

It turns out putting an underscore before colliding variables is much
more visible than putting it after them.