i don't know, how much of an optimization that would be. But it would be cleaner, so i'll change that, too.