Improved approach to edge annotations.
Merge branch 'master' into rich-referents