Minor post-merge edits.