[4.2] Minor readability fixes on Container