CLN: replace in bool block rather than special-casing in common