Merge "Update types for long trace arguments."