Even MORE multisite fixes, finally seem to have this slippery bugger pinned down.