Added handling of any %d format string for row index embedding.