Add missing generic types caused by 8f18dd4.