MCP: handle control IDs a little better