Clean up some of the API, using better function names and abstracting types.
1 file changed