Oops, one more bit of merge conflict cleanup. All tests passing again.