Yeah its kind of frustrating that they can't be pushed into the trait or otherwise better cleaned up. I moved most of those helpers into the copies so at least they are straight copy and paste now