Updated comment matching to be one global regex.