Some more cleanup in CSDRFilter