More work to deprecate old cparse and use libr_tcc