I removed any mention of Detector

Since a Null distortion is applied in the absence of a Detector, I set the Detector to None if one doesn't exist.
You're absolutely right.  Those lines can go away.