Update to scoring to match new evaluation API.