Ditto nit in #637, s/While/If/ would be clearer IMHPO