PDT-3884 Make better assumptions and simplify interface per feedback.