Spelling corrections.
Reapplying r204952 with fixes which should hopefully resolve linking issues with non-MSVC compilers.