Route via gen-transform again but with fixes.