Merge "Avoid using an anonymous union."