Post-1.0 changes

Higher-kinded types