More fixes for SRDA data collection pre- and post-processing (handling some other special cases).