Adopt and post-process proposed changes from Steve Kent and others.