Support different wording of comments. (Fixes #223)