Take new generic generators into use.
Remove unnecessary comments.