A few semantic changes.