Remove remaining recursive calls to cargo (#3113)

Remove remaining recursive calls to cargo (#3113) #184