Turns out that users with a modified page.tmpl need to modify it on upgrade, at least to add the FORCEBASEURL (so edit preview works), so there is no point in trying to retain compatability.