Silence -Wshadow warning and conform more to style.