Allow underscores in definition names
Allow comments in definition parameters