Improve API sketch.