Adopts the API to Diagnostic reporting changes in Stackhammer