Two more cases, to get Equality's tests to pass.
Merge branch 'master' of https://github.com/cwi-swat/rascal