Delete obsolete macro
Avoid generating invalid utf8
make prototype match dual use of callback for gtk2 and 3
Update to expect LilyPond 2.18