Continued revisions from PR #3088.