Clean up parallel API.
Further cleanup.