Refs #9736 Use FindDetectorsOutsideLimits instead.

Also do a little light refactoring while we're here.