Fix issue #1505 #7381

Job	Run time
clippy-check	3m 36s
fmt-check	22s
check-deps	10m 15s
quick-tests	6m 36s
smir-check	7s
all-tests (ubuntu-latest)	16m 58s
all-tests (windows-latest)	30m 59s
purification-tests	19m 58s
all-tests (macos-latest)	31m 36s
release-build (ubuntu-latest)	7m 21s
test-crates (0)	1h 2m 19s
release-build (windows-latest)	13m 37s
test-crates (1)	33m 43s
release-build (macos-latest)	11m 38s
test-crates (2)	43m 34s
test-on-prusti	0s
test-crates (3)	43m 5s
can-merge	4s
	5h 35m 48s

Provide feedback