Improve trigger to correctly trigger on resyncing, degraded, etc.