Cleanup.  Minor API change for new feature.