Remove confusing typedefs/unnecessary bridges