Minor IContainer-related improvements.