misc: fix tons of undefined behavior vol 2

[pkova]

Looks like I made some kind of rebase snafu on #720. Today I learned that if you force push something to a PR that results in 0 commits to the base branch github will just close the PR and disallow any further pushes to the branch!

Ok let's try this one then.