Cleanup and a little API change.