SI-6595, lost modifiers in early defs.