(cherry picked from commit 3a06e6af76)
3a06e6af76
Somehow I missed the failing CI report from trailing whitespace. Fixed a couple typos found by codespell while at it, and misc trailing semicolons in one of the files.