Remove some of the goofy coverage hacks.
Up version.