Adding contextual return handling for call_procedure and call_dbmethod