would these transforms benefit from being AST Transforms? If you feel they would improve, and don't have time I will gladly write them for you.