Less list edits, more hash table reconstruction.

Conflicts:
	scripts/cli53