Address code review comments.

1 job for add-classreader-input-checks in 7 minutes and 3 seconds (queued for 2 seconds)