Clean up ImpGen a bit.