Use score and value consistently

And other assorted small fixing, code style
tweaks and reshuffles in evaluate.cpp

No functional change.
Merge branch 'official' into redzero