Clar changes should be made in upstream clar

Changes to clar.c, etc., should be made in upstream clar so we
don't diverge.