Moving to jelly instead of groovy/jelly, to avoid VerifyErrors