Also remove the expr_form match for compound