Homongenize API.
Cleanup.