Refactoring code towards modularity.
Refactoring, small fixes, extension of the type computation model with 'static' semantics.