Clean up API for 0.2 and pass all integration tests.