Merge "More C compatibility."