Bring semantics up to spec