From Danilo and me: normalize again after resolving a typedef (fixes CMS).