Fix #883 and #156 #556

Job	Run time
checks / readme-snippets	14s
checks / pre-commit	32s
checks / test (3.11, locked, ubuntu-latest)	44s
checks / test (3.11, lowest-direct, windows-latest)	2m 44s
checks / test (3.10, locked, ubuntu-latest)	47s
checks / test (3.10, locked, windows-latest)	2m 23s
checks / test (3.10, lowest-direct, ubuntu-latest)	48s
checks / test (3.10, lowest-direct, windows-latest)	2m 24s
checks / test (3.11, locked, windows-latest)	2m 42s
checks / test (3.11, lowest-direct, ubuntu-latest)	43s
checks / test (3.12, locked, ubuntu-latest)	55s
checks / test (3.13, locked, ubuntu-latest)	45s
checks / test (3.14, locked, windows-latest)	2m 15s
checks / test (3.12, lowest-direct, windows-latest)	3m 32s
checks / test (3.13, locked, windows-latest)	2m 22s
checks / test (3.14, lowest-direct, windows-latest)	2m 17s
checks / test (3.12, lowest-direct, ubuntu-latest)	48s
checks / test (3.13, lowest-direct, windows-latest)	2m 16s
checks / test (3.14, locked, ubuntu-latest)	1m 8s
checks / test (3.14, lowest-direct, ubuntu-latest)	1m 5s
checks / test (3.13, lowest-direct, ubuntu-latest)	44s
checks / test (3.12, locked, windows-latest)	3m 51s
all-green	2s
	36m 1s

Provide feedback