Neha Sharma reported these to Rushabh Lathia just after I commit
355d3993 went in.  The patch is
Rushabh's, with input from me.