Check out b149b9d and see what you think. Seems like we can get the benefit of individual variables without needing to pull them out by hand.