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

Rather minor: adjustments bring develop into line with dev_4_4 after #731.