Cleaning up LilyPond format code.
Merged master.