DRILL-1634: Fix issue in complex type expression type resolution, when Drill queries a nested array.

code clean up.