We now index rows by actual expanded row number and don't count them
ourselves no more.