Issue #25523: Further a-to-an corrections.
34 files changed