Merge "Small improvements to statement collision reporting."