Ooops. Last commit introduced a bad bug in checking which sites to consider. Undoing that, and more cleaning.