Try to make PartExp generate less junk, and faster