Fixes #859, update of #860

Fixes bug where `xend` and `yend` were not passed along
as coordinates for transformation within `annotate`. This
led to the end of segments not appearing in the correct
location when a transformation was involved with one of the
coordinate scales.