Replaced delegating statement context with composite statement context