I'm all in favor of keeping lines legible.  Actually this block of code is really confusing to read.  I'm thinking of refactoring in a separate commit.