Check for command tag
signal end of completion options
Tidy up debug output