refactor: additional simplification and warning squashing

[alandtse]

I did try to take us to NG, but there was weirdness for some of the safewrites not being correct. Figured this precursor step may still be valuable.