Merge "Improved some toString() methods."