Simplify some minor bridge code