Also wanted to give you kudos on the approach you followed to have the generated replacements become extensions functions in the target class, it would have taken us ages to get there before trying a bunch of other stuff I had in mind and this is way cleaner! 👏