Remove variable references in typed containers to avoid warnings