Refactor: add an IVar to CMap to signal completion.