Merge "Avoid unexpected conversions to ArrayRef."