Clean up minor typos, no change in behavior.

Rather minor: adjustments bring develop into line with dev_4_4.
Merge pull request #735 from mtbc/typos

Clean up minor typos, no change in behavior (rebase).