Bug 6158: Optimization of if-feaures resolution during SchemaContext assembly