Don't apply chi2 prob cut by default if time-clustering is enabled; a few minimal changes