Refs #16751; fixes to evolve script