Miscellaneous code quality improvements #1898

Job	Run time
Resolve environment (ubuntu-latest, stable-v2.13.4)	36s
Resolve environment (macos-12, stable-v2.13.4)	2m 1s
Resolve environment (windows-latest, stable-v2.13.4)	1m 46s
Resolve environment (ubuntu-latest, default)	44s
Resolve environment (macos-latest, default)	1m 45s
Resolve environment (windows-latest, default)	3m 4s
Resolve environment (ubuntu-latest, linked)	44s
Resolve environment (macos-latest, linked)	2m 9s
Resolve environment (windows-latest, linked)	3m 3s
Resolve environment (ubuntu-latest, nightly-latest)	45s
Resolve environment (macos-latest, nightly-latest)	1m 47s
Resolve environment (windows-latest, nightly-latest)	2m 45s
	21m 9s

Provide feedback