Fix #883 and #156 #554

Job	Run time
checks / pre-commit	19s
checks / readme-snippets	10s
checks / test (3.10, locked, windows-latest)	2m 21s
checks / test (3.10, lowest-direct, ubuntu-latest)	47s
checks / test (3.11, lowest-direct, windows-latest)	2m 35s
checks / test (3.10, locked, ubuntu-latest)	46s
checks / test (3.10, lowest-direct, windows-latest)	2m 21s
checks / test (3.12, lowest-direct, windows-latest)	3m 58s
checks / test (3.11, lowest-direct, ubuntu-latest)	47s
checks / test (3.13, lowest-direct, ubuntu-latest)	43s
checks / test (3.12, locked, ubuntu-latest)	49s
checks / test (3.11, locked, windows-latest)	2m 31s
checks / test (3.13, locked, windows-latest)	2m 21s
checks / test (3.14, lowest-direct, ubuntu-latest)	1m 10s
checks / test (3.14, locked, ubuntu-latest)	1m 8s
checks / test (3.14, locked, windows-latest)	2m 23s
checks / test (3.11, locked, ubuntu-latest)	46s
checks / test (3.12, lowest-direct, ubuntu-latest)	48s
checks / test (3.13, lowest-direct, windows-latest)	2m 27s
checks / test (3.14, lowest-direct, windows-latest)	2m 17s
checks / test (3.12, locked, windows-latest)	3m 27s
checks / test (3.13, locked, ubuntu-latest)	42s
all-green	4s
	35m 40s

Provide feedback