Small interface change, and comments.