Merge pull request #107 from rust-mobile/rib/pr/consolidate-more-input-types

Consolidate input types to avoid portability hazards

Author: rib