Minor stuff scattered around

Just random minor stuff I found while browsing the code.

No functional change.
Rearrange interpolation formula

Put the division at the end to reduce
rounding errors. This alters the bench
due to different rounding errors, but
should not alter ELO in any way.

bench: 7615217
Merge branch 'master' into blocked_5th_6th