More inflection clean-up