Fix to maintain consistency in type dependence. Changed field types to
show dependency with fields instead of the declaring classes.
Merge branch 'master' of git@github.com:cwi-swat/rascal.git