sebb Sun, 03 Sep 2017 14:38:39 -0700
See issues 398 and 400.
Unless there are objections I propose to fix these.
