GROOVY-6357: Fix the way modifiers are updated