Some refactoring/cleanup

In particular, change to use <...> chords instead of <<...>> simultaneous notes for several things, which makes the code prettier and removes the need to work around Lilypond issues