Update scanner tools for new diagnostic API.