4312 looks really big, but it's just a refactor, and no net new code. Our test suite should ensure nothing broke.