Minimal changes to the interface.