Minor fixes to c4.el.