Done the second comment that you suggested.  But not sure whether it is really needed.  Given a new pull request.