more content in RowNumber
GroupedHybridCall might not need to substitute and eval if call is not a call after hybrid replace
simplifying