I usually like one-liners, but in this case I prefer to leave this since it's easier to extend (for sections or ad-hoc syntax)