Changes to bring into line with iShare 5.4

This changeset bring the events into line with the updated ones used in iShare 5.4 - there has been a substantial amount of consolidation of different vector-related tool code. From my initial testing this is all that needs to be done.