Change the interface somewhat.
Fix typo.