Another fix for named and unnamed grammar description generation.