Convert everything to the new API.