Debug emission cleanups