The contents of this block are (almost) the same as the previous block -- just get rid of the === true case?