Fix #883 and #156 #557

Job	Run time
checks / pre-commit	22s
checks / readme-snippets	13s
checks / test (3.11, lowest-direct, ubuntu-latest)	47s
checks / test (3.11, lowest-direct, windows-latest)	2m 29s
checks / test (3.10, lowest-direct, windows-latest)	2m 27s
checks / test (3.13, lowest-direct, ubuntu-latest)	46s
checks / test (3.12, lowest-direct, ubuntu-latest)	50s
checks / test (3.10, lowest-direct, ubuntu-latest)	43s
checks / test (3.13, lowest-direct, windows-latest)	2m 30s
checks / test (3.10, locked, ubuntu-latest)	48s
checks / test (3.13, locked, ubuntu-latest)	46s
checks / test (3.11, locked, windows-latest)	2m 47s
checks / test (3.12, lowest-direct, windows-latest)	3m 36s
checks / test (3.12, locked, windows-latest)	3m 21s
checks / test (3.12, locked, ubuntu-latest)	51s
checks / test (3.11, locked, ubuntu-latest)	47s
checks / test (3.10, locked, windows-latest)	2m 32s
checks / test (3.14, lowest-direct, ubuntu-latest)	1m 8s
checks / test (3.14, lowest-direct, windows-latest)	2m 22s
checks / test (3.14, locked, windows-latest)	2m 26s
checks / test (3.14, locked, ubuntu-latest)	1m 10s
checks / test (3.13, locked, windows-latest)	2m 36s
all-green	2s
	36m 19s

Provide feedback