Propose API changes discussed today.

Cc @erikvold @zer0