Fix: Work around Py2 scoping limitations when cleaning up after a diagnostic