Cleanup to support the type parameter section.