Fix local variable conflict in Forge patch and latest MCP mappings.