Cleanup #2686

Job	Run time
miri	1m 18s
test (stable)	8m 16s
test (1.26)	11m 56s
test (beta)	8m 21s
test (no rustup)	2m 21s
test (1.30)	11m 37s
test (nightly)	9m 12s
test (nightly, macos-11)	12m 25s
test (1.31)	9m 28s
test (1.36)	13m 20s
test (nightly, windows-2019)	12m 12s
test (1.39)	13m 1s
test (1.41)	10m 37s
deny / deny	17s
release-dry-run / prepare	8s
msrv / msrv	6m 42s
tidy / tidy	1m 32s
release-dry-run / build (aarch64-unknown-linux-gnu)	1m 52s
release-dry-run / build (aarch64-unknown-linux-musl)	1m 27s
release-dry-run / build (aarch64-apple-darwin, macos-11)	1m 51s
release-dry-run / build (aarch64-pc-windows-msvc, windows-2019)	3m 16s
release-dry-run / build (x86_64-unknown-linux-gnu)	1m 18s
release-dry-run / build (x86_64-unknown-linux-musl)	1m 40s
release-dry-run / build (x86_64-apple-darwin, macos-11)	1m 53s
release-dry-run / build (x86_64-pc-windows-msvc, windows-2019)	2m 32s
release-dry-run / build (x86_64-unknown-freebsd)	2m 30s
release-dry-run / build (universal-apple-darwin, macos-11)	2m 13s
	2h 33m 15s

Provide feedback