misc: fix more regressions and whitespace weirdness introduced in 913fcf1a.
Attach a file by drag & drop or click to upload
