Small code quality improvements, hopefully the last ones for the core package.

4 jobs for small-code-quality-improvements in 10 minutes and 22 seconds (queued for 2 seconds)