RFC: Improved CP Syntax

@igorT we are thinking of investigating this in a future CP.