Small tweaks to Cleave.