Changes to improve ndpp chi collision estimation.