cleanup: Avoid multiple declarations per statement. #210

Job	Run time
Build Android docker image	2m 23s
Build debian docker image	2m 7s
Build fedora docker image	3m 31s
Build ubuntu LTS docker image	5m 34s
Build flatpak docker	1m 58s
Build windows docker image (i686)	1m 46s
Check for translatable strings	47s
Build windows docker image (x86_64)	1m 42s
Update nightly release tag	5s
Alpine (full, Debug)	11m 19s
Docs	2m 8s
macOS user	18m 27s
Debian (minimal, Debug)	6m 3s
Fedora with ASAN (full, Debug)	7m 24s
Clang-Tidy	11m 17s
macOS distributable	25m 30s
Android	6m 56s
Flatpak	14m 9s
Windows (i686, Debug)	7m 44s
Windows (i686, Release)	7m 10s
Windows (x86_64, Debug)	10m 9s
Windows (x86_64, Release)	9m 45s
Ubuntu LTS	0s
	2h 37m 54s

Provide feedback