Cleaned up some internal APIs.