A few cleanups and fixes
I noticed these when rebasing a branch on top of master. Most are following !1488 (merged).
The commits are ordered by their level of confidence, from the most obvious to the least. The last few commits may actually indicate that some intended functionality went missing at some point during a rebase, so please review carefully.
CC: @jadahl
Edited by Dor Askayo