cpp: fixes for comments scenario in workflow spec