hehe... my vote is to revert for simplicity and readability (it tooks me a couple of minutes to figure out what was going on). I don't have very strong feelings on this though...