As discussed briefly in D58, the use of different integer types is inconsistent and not following correct practices in many places in the code, e.g. using signed short integers to index standard library containers.
The use of integer types should be reviewed and standardised. In particular default value setup and comparison s for EvtId.