Restore some API improvements.