Reduce unnecessary container operations for address mode optimization.

In the style of 94b98a9f6dc71eeee120f676adab75ae1668952b.