(#95) deep-level repeating groups getting mangled in resend-requests

Includes many cherry-picked commits by @aelgasser from #211