Use more-idiomatic parameter orderings
Fixing up interface
Improving some API types