Code cleanup: Moved related functions from Types class to Environments and Vectors classes
Merge branch 'master' into trace-line-numbers
 dixed compilation