Fixed up StateHolder round-tripping