Switch to flat API work in progress.