Unreviewed: fix test failures after r245280.