Revisions based on run-through #3.