v1+v2 support - more readable coding style for optional args and call_ids