Small bit of refactoring and cleanup to reduce direct calls to App.Container.