Also fixes some typos and reduces spelling suggestions to hints.
Resolves #2368.
This reverts commit 75a413a40e.
75a413a40e