Make punctuation consistent properly. Fixes #918.