smoothed arg for all DiffusionAnalyzer classmethods
Automatic Py3k merge for testing