Lots of changes in handling of Gibbs kernels.