Cleaned the DefaultEntityContainer a bit.