Some more semantic changes.