Changed subquery params to be AbstractExpression to handle aggregated expr, clean-up