Moved changes of type system into lem file