Updates ahead of LilyPond 2.18.