Bleu score refactoring.

Also, fixes (?) the averaging bug.