parser: Fix new parser to work with short forms.
parser: Convert get_call_id to new parser routines.