Cross format annotations

These are my changes in support of cross-format-annotations. I sent the pull request here since we've got some fuzzy matching stuff in here as well, which I needed to test cross-format-annotations were working.