Fixed up the semantics some more.