Simply define CH_DEL exactly then when there none yet.
Merge remote-tracking branch 'upstream/master'