More API cleanup.