Until the actual allowed claims are known it is extremely difficult to answer your question as even the change of a single punctuation mark could affect how a claim is constructed.

One has to remember that the EDoT Markman was based on the '584 as was then and, as such, any variance could render that construction moot. It is for this reason that I believe that a Californian Markman would take precedence.

Be well