Some API cleanup.

Added more overrides to make things easier.