Allow LilyPond syntax, and improve style