API cleanups:
