handle CFields after extracting null patterns (closes #1950)