API Design Tweaks

Some changes resulting from review with @headinthebox and @jhusain

General principles pursued are to simplify the mental model and surface area of the API.