Not sure we need these two variables either—the idea is that we use fewer, more important vars so we don't need tons more.