Some adjustments to respect the changed Rascal grammar.