Various small code cleanups

Split out from !3859 (merged)

Merge request reports

Loading