BUG additive_chi2 missing in KERNEL_PARAMS

Also made the definition more readable and introduced frozen sets.