Had forgotten to simplifie the exponent expressions.

Also had screwed up make-product a bit.