Clean up error reporting and add "events" to covered modules (used by
http & https)