Spoofax/928: fixes for bugs introduced by previous commit.