Revert dynamic draw value

When tested with weaker engines did not
performed as expected, actually it was even
a regression from standard version.

bench: 8430785
Some minor cleanup stuff

I came across while browsing the code.

No functional change.
Merge remote-tracking branch 'upstream/master'