Adjust the public API to be a bit more pleasant.