Final changes, including some more discussion.