More interface cleanup.