Small changes for the bridging plugin. /technically/, this is also pluggable now.