Implemented new transformation and removed old one subsumed by it.