Some more fixes (#4142) #16820

Job	Run time
doctest (1.10, ubuntu-latest)	26m 33s
test (1.6, short, ubuntu-latest)	1h 28m 51s
doctest (1.11-nightly, ubuntu-latest)	27m 17s
doctest (nightly, ubuntu-latest)	29m 40s
doctest (1.10, ubuntu-latest, depwarn=error)	25m 58s
test (1.6, long, ubuntu-latest)	54m 45s
doctest (1.10, macOS, RPTU)	12m 27s
test (1.10, short, ubuntu-latest)	1h 11m 22s
test (1.10, long, ubuntu-latest)	46m 41s
test (1.11-nightly, short, ubuntu-latest)	1h 25m 28s
test (1.11-nightly, long, ubuntu-latest)	52m 36s
test (nightly, short, ubuntu-latest)	1h 21m 26s
test (nightly, long, ubuntu-latest)	53m 22s
test (1.10, short, ubuntu-latest, depwarn=error)	1h 9m 9s
test (1.10, long, ubuntu-latest, depwarn=error)	44m 41s
test (1.10, short, macOS, RPTU)	13m 54s
test (1.10, long, macOS, RPTU)	14m 24s
test (1.10, book, ubuntu-latest)	2h 30m 15s
test (nightly, book, ubuntu-latest)	1h 6m 13s
	16h 55m 2s

Provide feedback