Use instrumentation from rpm_contrib with better coverage