Address code review comments.

1 job for fix-performance-regression in 6 minutes and 43 seconds (queued for 5 seconds)