Ensure token map is rebuilt when nodes are removed

Conflicts:
	CHANGELOG.rst