Some simplification of diffusion analyzer code.
Automatic Py3k merge for testing