Simplified context representation
No need for Set1
Decidable subtyping relation; rename _$_ => _#_
Removed mutual block