No coding performance changes; small encoding speed increase.

Change-Id: Ie459ee0ac549d15c2d5c713f733e67f2191f6b7a