Import cleanup.
First draft of type expression derivation.
Merge branch 'master' of https://github.com/DaMSL/K3-Core