further cleanup of generator for assert statements