Refactor struct and enum elements.