More compilation errors fixed.
Merge branch 'refactor-subtype' of https://github.com/cwi-swat/rascal.git into refactor-subtype