I was rather thinking about fixing it all, at least in the diff of this PR.