Updating to trunk rascal.
Refactoring.