Fix ecpg/preproc with minor grammar restructuring