GROOVY-7042 - Make sure doExtendTraits doesn't apply the fields helper twice