Allow for differential DFXML repeating

Also adjust cleanup.

Signed-off-by: Alex Nelson <a.nelson@prometheuscomputing.com>