Following the newer convention enhances readability and in addition this is a prelude to some macro changes in unimplemented I would like to make in order to simplify that code.

BUG=
R=stichnot@chromium.org

Review URL: https://codereview.chromium.org/1667553002 .

Patch from Reed Kotler <rkotlerimgtec@gmail.com>.