Commenting and minor API change.