fix vector expansion
remove nullability from template expansion
generators