Some cleanup of diffusion analyzer.
Automatic Py3k merge for testing