Scope reduction.

Change-Id: Ib77fccaf0c418e875816ed553f3540190ac0caee