Massive scope level reduction by early bail-out.

Change-Id: Ie620208f02bf74844f9b7cb904f9c5abbb10ca07