More API clean-ups

There is no external API changes, just more internal re-org + new functions.