Make event_count macros cleaner Fixes: #489 (cherry picked from commit 177e2171cb44e3929fbb0ec43b1bffb325b0e8ed)