If an routine returns a string then make that a RETURN_CALL. Otherwise do not replace. And remove need to specify return calls.