Some simplification of diffusion analyzer code.