I've found the answer to these questions. The thing to do is have 4 link elements; two in the 1.x style, and two in the 2.0 style.

Also, the OP Endpoint URL is necessary because the OP-Local Identifier isn't necessarily a URL, it could be a user name or email address.