Merge "Fix SubInfo#toString consistency."