Address code review comments.

1 job for use-opcode-flag-to-avoid-overridding-deprecated-methods in 11 minutes and 53 seconds (queued for 2 seconds)