Just took out the dump statements.  Submitting versin 1.7 for review.