Minor semantic changes.