Scrutinizer cleanup

Let's see how many issues less this is.

I did this myself, and only did changes where I'm entirely sure they'll still work.

@jancborchardt @PVince81 @DeepDiver1975 @tanghus @MorrisJobke