Fixed a few bugs in constraint collection. Also did more TODOs.
Merge branch 'typeAnalysis' of github.com:tudelft-mdsd/spoofax-jasmin into typeAnalysis