A better version of previous commit: refetching site node info just when really needed and better wording on comments. Patch by Gustaf Neumann.