move 'with' statement implementation back into WithTransform to fix 'with' statement...