Serialize formula if present

It seems to be important that the <f>..</f> comes before the <v>..</v>

This seems to work in a round-trip on a couple of formulae I tried.