runtime: More consistency in the API.
Fix make recursion for bridge.