Simplify diffusion_analyzer a little.