Close GH-2: Update to new 6to5 API.