Merge "Improves dump() to handle special cases."