Make it so TypeError is raised if an instance of an object is put in an

'except' clause.  Also refactor some code to help keep Neal Norwitz happy.