Removed 'indicator' from all mainline packages other than tonalanalysistools.