bridge: minor cleanups