What's wrong with the initial version here? I find it considerably easier to read than the more verbose version.