Include match in generators; clean up generators and particles.