Support expressions in aggregate_rows, fixes #484.