Simplify multiplet code

+ Everything is a multiplet now, and hence an array of intensities, even
  if it has only one component
+ This avoids having to special-case the scalar case, which greatly
  simplifies the code
+ Also we normalize to the brightest component, not to the sum of
  components