A couple of improvements, inspired by kirby@'s comments.

Most are webhttrack fixes.