Updating: improving ccomp-instr-subst.