Split CreateEntityTool and fix a couple of bugs related to entity change notificatoins.