(hopefully) last syntax tweaks.
Spoofax update
Updated test to last syntax changes