More API polish.