Trafo improvements, ready for ReturnStatement