Fix a generics issue.
Remove old comment.