They were all in code that is now dead, so I spent some time
verifying that and cleaning it up.