Some small code simplifications.

Functionally identical, no change in bench (4132374).