DSP: General cleanup. No behaviour change.