Fix lambda handling in CVC parser