Move search types and modality marshalling to use message busses. Remove bespoke jni/iOS types that previously did this. Buddy = Tim J.