Further tweak the semantics.