Better defend against plan/commit race