Updated for latest annotation toolbar changes.