Tweak D-P-F to avoid duplicating code.