Fix some leaky dependencies in transform modules