Rearrange code for popping to root when tapping selected tab bar item.

We don't want to do it when selecting the view controller, we want to do it
when tapping the tab bar item.
Fix lame names in basement.

I was trying to make them better for VoiceOver. Oops.