This should be done in the DI extension, not in a compiler pass