*_types.rs: Use struct tuples