The env data flow in those two is too different. I could do it, but it will probably produce even more code than it was before.