Improved ApplyableEntitySpawner for OverwriteEntities
Code cleanup