Use internal command variables for consistent style.
Reported by: rgrimes@ MFC after: 13 days X-MFC with: r345400