More minor refactoring with the UnsafeConflictChecker... not sure why we're not maxing out the executors at full speed with this...