I vote we put this back to the other two-line form.  I think it is actually cleaner and easier to read.