Some cleanup of diffusion analyzer.