Clean up faker a bit to the point that it's usable for backup/restore testing.