more refractoring of dfix handling in dsr.py