Change semantics slightly