Partial rewrite after site changes.