More generator changes.