Minor api clean up.