Tweaks to spec semantics.