Clean up some more checks and the checking programs.