Merge pull request #3348 from Minnozz/more-indexes #122

Job	Run time
Formatting (black; run ./bw-dev black to fix)	17s
Typing (mypy)	46s
Linting (pylint)	1m 54s
Tests (pytest)	4m 18s
	7m 15s

Provide feedback