More and more tweaks to fit into the rascal semantics.