Reformulation of the Korringa - Kohn - Rostoker coherent potential approximation for the treatment of space-filling cell potentials and charge-transfer effects