More work on cparser: