Fixes #37: Be a little more sophisticated as to how scores are calculated.