Some internal changes on semantics.