Fix #883 and #156 #558

Job	Run time
checks / pre-commit	22s
checks / readme-snippets	11s
checks / test (3.10, locked, ubuntu-latest)	47s
checks / test (3.12, lowest-direct, ubuntu-latest)	50s
checks / test (3.11, locked, ubuntu-latest)	45s
checks / test (3.11, locked, windows-latest)	2m 26s
checks / test (3.10, lowest-direct, windows-latest)	2m 25s
checks / test (3.10, locked, windows-latest)	2m 20s
checks / test (3.14, locked, windows-latest)	2m 33s
checks / test (3.13, locked, windows-latest)	2m 28s
checks / test (3.12, locked, ubuntu-latest)	52s
checks / test (3.11, lowest-direct, ubuntu-latest)	45s
checks / test (3.11, lowest-direct, windows-latest)	2m 26s
checks / test (3.12, locked, windows-latest)	3m 42s
checks / test (3.14, lowest-direct, windows-latest)	2m 21s
checks / test (3.14, lowest-direct, ubuntu-latest)	1m 8s
checks / test (3.13, lowest-direct, ubuntu-latest)	43s
checks / test (3.13, locked, ubuntu-latest)	42s
checks / test (3.12, lowest-direct, windows-latest)	3m 51s
checks / test (3.10, lowest-direct, ubuntu-latest)	48s
checks / test (3.13, lowest-direct, windows-latest)	2m 58s
checks / test (3.14, locked, ubuntu-latest)	1m 11s
all-green	5s
	36m 39s

Provide feedback