Some repairs to the comment handling (refs #4343)