oops
add missing cases for pattern-matching against CP syntax