Progress on struct normalization