Improve semantics.