Cleaned up bindEntityEvents spec