Fix #22 and fix #23.

No correlation between sample counts and estimates of year-to-year drift.