Fixes handing of expression functions (for which the expression was
identified as an aggregate)
Move conditional expressions out of 'aggregate', to conform with ARM and
resolve the above amgiguity
Inline expression_list, which was resulting in a conflict with a
record_component_association.