Improved semantics.