Fix cascade problem with site.baseurl.

Problem described in #931. This is a fix for it.