I have fixed the CCF in #77, attached a patch and interdiff for same. Please ...