Minor fix to C-Form analysis