Simplify ensure_container