fix missing arguement tracking

change logic somewhat; make for easier filtering of events with
mismatching definitions