I actually considered that too, the first commit was basically that :smile: 

I think breaking it into several lines makes a lot of sense and is more consistent. I'm going to implement it that way.