Improvements to ApiCop listeners