Fixing up the dumper to be a bit more human readable.