calc/disagg:

Corrected implementation of PMF extractors, per the new equation. Tests are
broken, though.