More progress in CFI refinement.