A bunch of commits cleaning up mostly clutter related things extracted from !3433. This is an attempt at reducing the main MR even more.
Written by @jadahl, reviewed by me. Looking for one more review before merging.