Separated out ScoreAverage enum.
Switched SCORE_TYPE to be double so that averaging doesn't suffer from
integer truncation.
More work on more frequent mixing.