fix #3325: layout of multi-voice seconds and unisons

Do not merge yet, but I am submitting the PR so we can see how the tests (and benchmark) go.