Tweaking API design.