nested expressions extraction improvements