Fix #883 and #156 #555

Job	Run time
checks / readme-snippets	11s
checks / pre-commit	33s
checks / test (3.11, lowest-direct, ubuntu-latest)	48s
checks / test (3.10, locked, windows-latest)	3m 31s
checks / test (3.11, locked, windows-latest)	2m 43s
checks / test (3.11, locked, ubuntu-latest)	50s
checks / test (3.10, lowest-direct, windows-latest)	2m 40s
checks / test (3.12, lowest-direct, ubuntu-latest)	49s
checks / test (3.12, locked, ubuntu-latest)	52s
checks / test (3.11, lowest-direct, windows-latest)	3m 0s
checks / test (3.10, locked, ubuntu-latest)	44s
checks / test (3.13, locked, ubuntu-latest)	41s
checks / test (3.13, locked, windows-latest)	2m 57s
checks / test (3.13, lowest-direct, ubuntu-latest)	46s
checks / test (3.13, lowest-direct, windows-latest)	2m 27s
checks / test (3.10, lowest-direct, ubuntu-latest)	49s
checks / test (3.14, lowest-direct, ubuntu-latest)	1m 7s
checks / test (3.14, locked, ubuntu-latest)	1m 15s
checks / test (3.14, locked, windows-latest)	2m 19s
checks / test (3.14, lowest-direct, windows-latest)	2m 49s
checks / test (3.12, lowest-direct, windows-latest)	3m 31s
checks / test (3.12, locked, windows-latest)	3m 33s
all-green	3s
	38m 58s

Provide feedback