Minor change to tidy up common code.
Complete the integration of ICC algorithm to use common code.