Adding optimization for multi-part Match() statements.