Cleanup in qa/469 and exception papi.* (generated using -lpapi)