Better NEAT support of cycles