Merge "Shenanigans to make create_reference_dumps.py more usable."