GROOVY-6527: Change new ClassNode to ClassHelper.make