More cases for gsusbst-more-gen