better CCCR parsing, extending to FBRs and CIS