Fixed inconsistencies between events call sites.
0.14.9