Hey @mrmurphy, it’s pretty much the same, but on the AST level. During the update, I searched for all the generated functions by the ppx and annotated each with the dedicated attribute. I manually counted arguments to pass a correct number to the @res.arity. Here is the commit with the changes.