Address the code review comments.

1 job for 317837-fix-cast-regression in 7 minutes and 55 seconds (queued for 5 seconds)