refactored `with` in last stage of translation.