Also fixes some typos and reduces spelling suggestions to hints.
Closes #1611
(cherry picked from commit e12e095)
(cherry picked from commit a2be7f7)