Minor adjustments to the API.
4.0.1