Use Score and Value consistently

Part of a patch by Marco.