Fix up comment handling, now that the upstream interface has changed...